diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 18:05:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 18:05:42 -0500 |
| commit | 59d8e5eb2bd5593d8220db0e25206cdfc42e83ea (patch) | |
| tree | 5a11524581ff040f2c335fc6a318ff54f100552c /arch | |
| parent | c4c5ff09872751eeb412e3e1af484955529426a1 (diff) | |
| parent | c3d6b628395fe6ec3442a83ddf02334c54867d43 (diff) | |
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.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/boot/head.S b/arch/alpha/boot/head.S index b06812bcac83..8efb26686d47 100644 --- a/arch/alpha/boot/head.S +++ b/arch/alpha/boot/head.S | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * initial bootloader stuff.. | 4 | * initial bootloader stuff.. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <asm/pal.h> | ||
| 7 | 8 | ||
| 8 | .set noreorder | 9 | .set noreorder |
| 9 | .globl __start | 10 | .globl __start |