Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

diff --combined arch/powerpc/kernel/Makefile
index 17ed5018288b2b5631b8e4b30618e6274f0cb87b,0faf95c93ef86bdea8b8cf3a053be954944a5439..144e284d21dde7889b1353f1c14ce1a558bd66cc
--- 1/arch/powerpc/kernel/Makefile
--- 2/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -4,6 -4,7 +4,6 @@@
  
  ifeq ($(CONFIG_PPC64),y)
  EXTRA_CFLAGS  += -mno-minimal-toc
 -CFLAGS_ioctl32.o += -Ifs/
  endif
  ifeq ($(CONFIG_PPC32),y)
  CFLAGS_prom_init.o      += -fPIC
@@@ -15,7 -16,7 +15,7 @@@ obj-y                         := semaphore.o cputable.o ptra
  obj-y                         += vdso32/
  obj-$(CONFIG_PPC64)           += setup_64.o binfmt_elf32.o sys_ppc32.o \
                                   signal_64.o ptrace32.o systbl.o \
 -                                 paca.o ioctl32.o cpu_setup_power4.o \
 +                                 paca.o cpu_setup_power4.o \
                                   firmware.o sysfs.o idle_64.o
  obj-$(CONFIG_PPC64)           += vdso64/
  obj-$(CONFIG_ALTIVEC)         += vecemu.o vector.o
@@@ -54,7 -55,7 +54,7 @@@ obj-$(CONFIG_BOOTX_TEXT)      += btext.
  obj-$(CONFIG_6xx)             += idle_6xx.o
  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_KPROBES)         += kprobes.o
- obj-$(CONFIG_SERIAL_8250)     += legacy_serial.o udbg_16550.o
+ obj-$(CONFIG_PPC_UDBG_16550)  += legacy_serial.o udbg_16550.o
  module-$(CONFIG_PPC64)                += module_64.o
  obj-$(CONFIG_MODULES)         += $(module-y)
  

diff --combined arch/powerpc/kernel/sys_ppc32.c
index 0ee44be4ab730228925883a4db260fb6f8c744db,9b6d965fb13e7e21334828baa73faa4ae94feeae..475249dc2350db4f735761252db0aff01c13b0ec
--- 1/arch/powerpc/kernel/sys_ppc32.c
--- 2/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@@ -552,30 -552,6 +552,6 @@@ asmlinkage long compat_sys_sched_rr_get
        return ret;
  }
  
- asmlinkage int compat_sys_pciconfig_read(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
- {
-       return sys_pciconfig_read((unsigned long) bus,
-                                 (unsigned long) dfn,
-                                 (unsigned long) off,
-                                 (unsigned long) len,
-                                 compat_ptr(ubuf));
- }
- 
- asmlinkage int compat_sys_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubuf)
- {
-       return sys_pciconfig_write((unsigned long) bus,
-                                  (unsigned long) dfn,
-                                  (unsigned long) off,
-                                  (unsigned long) len,
-                                  compat_ptr(ubuf));
- }
- 
- asmlinkage int compat_sys_pciconfig_iobase(u32 which, u32 in_bus, u32 in_devfn)
- {
-       return sys_pciconfig_iobase(which, in_bus, in_devfn);
- }
- 
- 
  /* Note: it is necessary to treat mode as an unsigned int,
   * with the corresponding cast to a signed int to insure that the 
   * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
@@@ -956,6 -932,38 +932,6 @@@ long ppc32_fadvise64(int fd, u32 unused
                             advice);
  }
  
 -long ppc32_timer_create(clockid_t clock,
 -                      struct compat_sigevent __user *ev32,
 -                      timer_t __user *timer_id)
 -{
 -      sigevent_t event;
 -      timer_t t;
 -      long err;
 -      mm_segment_t savefs;
 -
 -      if (ev32 == NULL)
 -              return sys_timer_create(clock, NULL, timer_id);
 -
 -      if (get_compat_sigevent(&event, ev32))
 -              return -EFAULT;
 -
 -      if (!access_ok(VERIFY_WRITE, timer_id, sizeof(timer_t)))
 -              return -EFAULT;
 -
 -      savefs = get_fs();
 -      set_fs(KERNEL_DS);
 -      /* The __user pointer casts are valid due to the set_fs() */
 -      err = sys_timer_create(clock,
 -              (sigevent_t __user *) &event,
 -              (timer_t __user *) &t);
 -      set_fs(savefs);
 -
 -      if (err == 0)
 -              err = __put_user(t, timer_id);
 -
 -      return err;
 -}
 -
  asmlinkage long compat_sys_add_key(const char __user *_type,
                              const char __user *_description,
                              const void __user *_payload,

diff --combined arch/powerpc/kernel/systbl.S
index dd2ab85e3513112d5842a1dbb8628f8e3aeac006,c3ae74b1bf2da61221a0677cadf9b857bb8d7b76..68013179a503ca5fe4c2a3bd1157e06a198d58db
--- 1/arch/powerpc/kernel/systbl.S
--- 2/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@@ -239,9 -239,9 +239,9 @@@ SYS32ONLY(ftruncate64
  SYSX(sys_ni_syscall,sys_stat64,sys_stat64)
  SYSX(sys_ni_syscall,sys_lstat64,sys_lstat64)
  SYSX(sys_ni_syscall,sys_fstat64,sys_fstat64)
- COMPAT_SYS(pciconfig_read)
- COMPAT_SYS(pciconfig_write)
- COMPAT_SYS(pciconfig_iobase)
+ SYSCALL(pciconfig_read)
+ SYSCALL(pciconfig_write)
+ SYSCALL(pciconfig_iobase)
  SYSCALL(ni_syscall)
  SYSCALL(getdents64)
  SYSCALL(pivot_root)
@@@ -281,7 -281,7 +281,7 @@@ SYSCALL(epoll_create
  SYSCALL(epoll_ctl)
  SYSCALL(epoll_wait)
  SYSCALL(remap_file_pages)
 -SYSX(sys_timer_create,ppc32_timer_create,sys_timer_create)
 +SYSX(sys_timer_create,compat_sys_timer_create,sys_timer_create)
  COMPAT_SYS(timer_settime)
  COMPAT_SYS(timer_gettime)
  SYSCALL(timer_getoverrun)