]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://oak/home/sfr/kernels/iseries/work
authorPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 02:08:55 +0000 (13:08 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 10 Nov 2005 02:08:55 +0000 (13:08 +1100)
1  2 
arch/powerpc/kernel/Makefile
arch/ppc/kernel/ppc_ksyms.c
arch/ppc64/kernel/Makefile

index 103cb8128ef4e9ed33f51ca0293c3cd0014fe576,cbdc14261655e9f7098c68cbc0d7edd6a0e7e311..92cfabf929bc73ac2a01192363b6631a2f8458d0
@@@ -4,7 -4,6 +4,7 @@@
  
  ifeq ($(CONFIG_PPC64),y)
  EXTRA_CFLAGS  += -mno-minimal-toc
 +CFLAGS_ioctl32.o += -Ifs/
  endif
  ifeq ($(CONFIG_PPC32),y)
  CFLAGS_prom_init.o      += -fPIC
@@@ -12,11 -11,9 +12,11 @@@ CFLAGS_btext.o              += -fPI
  endif
  
  obj-y                         := semaphore.o cputable.o ptrace.o syscalls.o \
-                                  signal_32.o pmc.o
+                                  irq.o signal_32.o pmc.o
  obj-$(CONFIG_PPC64)           += setup_64.o binfmt_elf32.o sys_ppc32.o \
 -                                 signal_64.o ptrace32.o systbl.o
 +                                 signal_64.o ptrace32.o systbl.o \
 +                                 paca.o ioctl32.o cpu_setup_power4.o \
 +                                 firmware.o
  obj-$(CONFIG_ALTIVEC)         += vecemu.o vector.o
  obj-$(CONFIG_POWER4)          += idle_power4.o
  obj-$(CONFIG_PPC_OF)          += of_device.o
index fc0d05c698958d7eda82bec3573ed689f350dd65,c4d5b598843057bb9bfe5da3e456d8aaef22f26c..6550de73a8551fe1aeec0b3fb3589492c87880c6
@@@ -46,7 -46,6 +46,7 @@@
  #include <asm/btext.h>
  #include <asm/div64.h>
  #include <asm/xmon.h>
 +#include <asm/signal.h>
  
  #ifdef  CONFIG_8xx
  #include <asm/commproc.h>
@@@ -58,6 -57,7 +58,6 @@@ extern void machine_check_exception(str
  extern void alignment_exception(struct pt_regs *regs);
  extern void program_check_exception(struct pt_regs *regs);
  extern void single_step_exception(struct pt_regs *regs);
 -extern int do_signal(sigset_t *, struct pt_regs *);
  extern int pmac_newworld;
  extern int sys_sigreturn(struct pt_regs *regs);
  
@@@ -78,7 -78,6 +78,6 @@@ EXPORT_SYMBOL(program_check_exception)
  EXPORT_SYMBOL(single_step_exception);
  EXPORT_SYMBOL(sys_sigreturn);
  EXPORT_SYMBOL(ppc_n_lost_interrupts);
- EXPORT_SYMBOL(ppc_lost_interrupts);
  
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
  EXPORT_SYMBOL(DMA_MODE_READ);
index 7548968b7997c5db13f8236b93fe1c0d5f77f0e3,13e479846249aac4267771037e0f5948f6ff430f..1f71f23cc26d230b79787775a2720c71ce114db4
@@@ -11,11 -11,12 +11,11 @@@ obj-y               :=     misc.o prom.
  
  endif
  
- obj-y               +=        irq.o idle.o dma.o \
+ obj-y               +=        idle.o dma.o \
 -                      align.o pacaData.o \
 -                      udbg.o ioctl32.o \
 +                      align.o \
 +                      udbg.o \
                        rtc.o \
 -                      cpu_setup_power4.o \
 -                      iommu.o sysfs.o vdso.o firmware.o
 +                      iommu.o sysfs.o vdso.o
  obj-y += vdso32/ vdso64/
  
  pci-obj-$(CONFIG_PPC_MULTIPLATFORM)   += pci_dn.o pci_direct_iommu.o
@@@ -30,6 -31,7 +30,6 @@@ endi
  obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o
  
  obj-$(CONFIG_KEXEC)           += machine_kexec.o
 -obj-$(CONFIG_EEH)             += eeh.o
  obj-$(CONFIG_PROC_FS)         += proc_ppc64.o
  obj-$(CONFIG_MODULES)         += module.o
  ifneq ($(CONFIG_PPC_MERGE),y)
@@@ -50,6 -52,8 +50,6 @@@ obj-$(CONFIG_PPC_MAPLE)               += udbg_16550.
  
  obj-$(CONFIG_KPROBES)         += kprobes.o
  
 -CFLAGS_ioctl32.o += -Ifs/
 -
  ifneq ($(CONFIG_PPC_MERGE),y)
  ifeq ($(CONFIG_PPC_ISERIES),y)
  arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s