Merge branch 'quilt/rr'

Conflicts:
	arch/alpha/Kconfig
	arch/mips/kernel/module.c
	arch/s390/Kconfig
	arch/xtensa/Kconfig

diff --cc arch/alpha/Kconfig
index 9944dedee5b1b1b31abf08599a44421333bd9290,e73a1a7d58969db46ae0b5b52c5420d8a201a4f2..7e3710c0cce5a4c2ef51b8a889a061979a0b9b24
--- 1/arch/alpha/Kconfig
--- 2/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -18,8 -18,8 +18,10 @@@ config ALPH
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_CMOS_UPDATE
 +      select GENERIC_STRNCPY_FROM_USER
 +      select GENERIC_STRNLEN_USER
+       select HAVE_MOD_ARCH_SPECIFIC
+       select MODULES_USE_ELF_RELA
        help
          The Alpha is a 64-bit general-purpose processor designed and
          marketed by the Digital Equipment Corporation of blessed memory,

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/blackfin/Kconfig
Simple merge

diff --cc arch/c6x/Kconfig
Simple merge

diff --cc arch/cris/Kconfig
Simple merge

diff --cc arch/m68k/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/include/asm/module.h
Simple merge

diff --cc arch/mips/kernel/Makefile
index 2dbecf843d74648888dfb4395ad9a66f485dd03d,cd1e6c2421b2378a2863489cb4db26f5977ba1d5..a61deb354a2b8b425cb7d6533b316c00f3561497
--- 1/arch/mips/kernel/Makefile
--- 2/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@@ -31,15 -31,32 +31,16 @@@ obj-$(CONFIG_SYNC_R4K)             += sync-r4k.
  
  obj-$(CONFIG_STACKTRACE)      += stacktrace.o
  obj-$(CONFIG_MODULES)         += mips_ksyms.o module.o
+ obj-$(CONFIG_MODULES_USE_ELF_RELA) += module-rela.o
  
 +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
  obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
  
 -obj-$(CONFIG_CPU_LOONGSON2)   += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_MIPS32)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_MIPS64)      += r4k_fpu.o r4k_switch.o
 +obj-$(CONFIG_CPU_R4K_FPU)     += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R3000)               += r2300_fpu.o r2300_switch.o
 -obj-$(CONFIG_CPU_R4300)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R4X00)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R5000)               += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_R6000)               += r6000_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R5432)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R5500)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R8000)               += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_RM7000)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_RM9000)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_NEVADA)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_R10000)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_SB1)         += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_TX39XX)      += r2300_fpu.o r2300_switch.o
 -obj-$(CONFIG_CPU_TX49XX)      += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_VR41XX)      += r4k_fpu.o r4k_switch.o
  obj-$(CONFIG_CPU_CAVIUM_OCTEON)       += octeon_switch.o
 -obj-$(CONFIG_CPU_XLR)         += r4k_fpu.o r4k_switch.o
 -obj-$(CONFIG_CPU_XLP)         += r4k_fpu.o r4k_switch.o
  
  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_SMP_UP)          += smp-up.o

diff --cc arch/mips/kernel/module.c
index 4f8c3cba8c0c45180cdabe08ac05aa43e652395f,da6dcd934f7cb223eb2a25cbfac403260f77da0d..07ff5812ffaf7503826f74af41aa3a7e7dce4a6f
--- 1/arch/mips/kernel/module.c
--- 2/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@@ -132,25 -107,6 +105,17 @@@ static int apply_r_mips_hi16_rel(struc
        return 0;
  }
  
- static int apply_r_mips_hi16_rela(struct module *me, u32 *location, Elf_Addr v)
- {
-       *location = (*location & 0xffff0000) |
-                   ((((long long) v + 0x8000LL) >> 16) & 0xffff);
- 
-       return 0;
- }
- 
 +static void free_relocation_chain(struct mips_hi16 *l)
 +{
 +      struct mips_hi16 *next;
 +
 +      while (l) {
 +              next = l->next;
 +              kfree(l);
 +              l = next;
 +      }
 +}
 +
  static int apply_r_mips_lo16_rel(struct module *me, u32 *location, Elf_Addr v)
  {
        unsigned long insnlo = *location;

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
index c915b5c1b42a3eacc06e5de9c158d70ccfdac01a,3825aac090c2ba88710a5704eb02dcc7c5f10693..99446707cac577ff68bfa53513ae21fa16a3f987
--- 1/arch/s390/Kconfig
--- 2/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -131,7 -124,8 +131,9 @@@ config S39
        select GENERIC_TIME_VSYSCALL
        select GENERIC_CLOCKEVENTS
        select KTIME_SCALAR if 32BIT
 +      select HAVE_ARCH_SECCOMP_FILTER
+       select HAVE_MOD_ARCH_SPECIFIC
+       select MODULES_USE_ELF_RELA
  
  config SCHED_OMIT_FRAME_POINTER
        def_bool y
@@@ -654,13 -588,56 +656,12 @@@ config S390_GUES
        depends on 64BIT && EXPERIMENTAL
        select VIRTUALIZATION
        select VIRTIO
-       select VIRTIO_RING
        select VIRTIO_CONSOLE
        help
 -        Select this option if you want to run the kernel as a guest under
 -        the KVM hypervisor. This will add detection for KVM as well  as a
 -        virtio transport. If KVM is detected, the virtio console will be
 -        the default console.
 -
 -config SECCOMP
 -      def_bool y
 -      prompt "Enable seccomp to safely compute untrusted bytecode"
 -      depends on PROC_FS
 -      help
 -        This kernel feature is useful for number crunching applications
 -        that may need to compute untrusted bytecode during their
 -        execution. By using pipes or other transports made available to
 -        the process as file descriptors supporting the read/write
 -        syscalls, it's possible to isolate those applications in
 -        their own address space using seccomp. Once seccomp is
 -        enabled via /proc/<pid>/seccomp, it cannot be disabled
 -        and the task is only allowed to execute a few safe syscalls
 -        defined by each seccomp mode.
 -
 -        If unsure, say Y.
 -
 -endmenu
 +        Enabling this option adds support for virtio based paravirtual device
 +        drivers on s390.
  
 -menu "Power Management"
 -
 -source "kernel/power/Kconfig"
 +        Select this option if you want to run the kernel as a guest under
 +        the KVM hypervisor.
  
  endmenu
 -
 -source "net/Kconfig"
 -
 -config PCMCIA
 -      def_bool n
 -
 -config CCW
 -      def_bool y
 -
 -source "drivers/Kconfig"
 -
 -source "fs/Kconfig"
 -
 -source "arch/s390/Kconfig.debug"
 -
 -source "security/Kconfig"
 -
 -source "crypto/Kconfig"
 -
 -source "lib/Kconfig"
 -
 -source "arch/s390/kvm/Kconfig"

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
index c161367386e467d48605069552fad89097859595,4816e44001f1ed8943c7fa70c6af199ba674c4df..8c82cd87082e43bf757e94c413419a7291feb2a1
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -11,7 -11,7 +11,8 @@@ config XTENS
        select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
 +      select GENERIC_PCI_IOMAP
+       select MODULES_USE_ELF_RELA
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
          primarily for embedded systems.  These processors are both