Commit 92e840b8 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents eca96830 40f09f3c
...@@ -100,9 +100,6 @@ typedef unsigned long elf_fpregset_t; ...@@ -100,9 +100,6 @@ typedef unsigned long elf_fpregset_t;
#define ELF_PLATFORM (NULL) #define ELF_PLATFORM (NULL)
#define SET_PERSONALITY(ex) \
set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
#define STACK_RND_MASK (0) #define STACK_RND_MASK (0)
#ifdef CONFIG_METAG_USER_TCM #ifdef CONFIG_METAG_USER_TCM
......
...@@ -40,6 +40,7 @@ endchoice ...@@ -40,6 +40,7 @@ endchoice
config NUMA config NUMA
bool "Non Uniform Memory Access (NUMA) Support" bool "Non Uniform Memory Access (NUMA) Support"
select ARCH_WANT_NUMA_VARIABLE_LOCALITY
help help
Some Meta systems have MMU-mappable on-chip memories with Some Meta systems have MMU-mappable on-chip memories with
lower latencies than main memory. This enables support for lower latencies than main memory. This enables support for
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment