diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 14:45:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-08 14:45:17 -0800 |
| commit | 92e840b84e75cd662d7e992711e1d073295c9b47 (patch) | |
| tree | 7264c6c54b74b6f592c8d6b762e20e53aa2eda8b /arch | |
| parent | eca968305c2a5fbc3445c22b8e8e809196d28893 (diff) | |
| parent | 40f09f3cd69a356b4245794e46439674336413fb (diff) | |
| download | linux-92e840b84e75cd662d7e992711e1d073295c9b47.tar.bz2 | |
Merge tag 'metag-for-v3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag bugfixes from James Hogan:
"A couple of fairly minor arch/metag integration fixes from v3.9-rc1:
- remove SET_PERSONALITY(): use default definition like other arches
now do.
- inhibit NUMA balancing: like SH, NUMA is used for memories with
different latencies. ARCH_WANT_VARIABLE_LOCALITY has been added
for this purpose."
* tag 'metag-for-v3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: Inhibit NUMA balancing.
metag: remove SET_PERSONALITY()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/metag/include/asm/elf.h | 3 | ||||
| -rw-r--r-- | arch/metag/mm/Kconfig | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/metag/include/asm/elf.h b/arch/metag/include/asm/elf.h index d63b9d0e57dd..d2baf6961794 100644 --- a/arch/metag/include/asm/elf.h +++ b/arch/metag/include/asm/elf.h @@ -100,9 +100,6 @@ typedef unsigned long elf_fpregset_t; #define ELF_PLATFORM (NULL) -#define SET_PERSONALITY(ex) \ - set_personality(PER_LINUX | (current->personality & (~PER_MASK))) - #define STACK_RND_MASK (0) #ifdef CONFIG_METAG_USER_TCM diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig index cd7f2f2ad416..975f2f4e3ecf 100644 --- a/arch/metag/mm/Kconfig +++ b/arch/metag/mm/Kconfig @@ -40,6 +40,7 @@ endchoice config NUMA bool "Non Uniform Memory Access (NUMA) Support" + select ARCH_WANT_NUMA_VARIABLE_LOCALITY help Some Meta systems have MMU-mappable on-chip memories with lower latencies than main memory. This enables support for |