aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-08 15:05:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-08 15:05:42 -0800
commit59d8e5eb2bd5593d8220db0e25206cdfc42e83ea (patch)
tree5a11524581ff040f2c335fc6a318ff54f100552c /arch
parentc4c5ff09872751eeb412e3e1af484955529426a1 (diff)
parentc3d6b628395fe6ec3442a83ddf02334c54867d43 (diff)
downloadlinaro-lsk-59d8e5eb2bd5593d8220db0e25206cdfc42e83ea.tar.gz
Merge branch 'akpm' (fixes from Andrew)
Merge misc fixes from Andrew Morton. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: alpha: boot: fix build breakage introduced by system.h disintegration memcg: initialize kmem-cache destroying work earlier Randy has moved ksm: fix m68k build: only NUMA needs pfn_to_nid dmi_scan: fix missing check for _DMI_ signature in smbios_present() Revert parts of "hlist: drop the node parameter from iterators" idr: remove WARN_ON_ONCE() on negative IDs mm/mempolicy.c: fix sp_node_init() argument ordering mm/mempolicy.c: fix wrong sp_node insertion ipc: don't allocate a copy larger than max ipc: fix potential oops when src msg > 4k w/ MSG_COPY
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/boot/head.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/boot/head.S b/arch/alpha/boot/head.S
index b06812bcac8..8efb26686d4 100644
--- a/arch/alpha/boot/head.S
+++ b/arch/alpha/boot/head.S
@@ -4,6 +4,7 @@
* initial bootloader stuff..
*/
+#include <asm/pal.h>
.set noreorder
.globl __start