linux-stable-rt/include/asm-powerpc
Linus Torvalds 489de30259 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..
2007-07-16 17:58:08 -07:00
..
iseries
8253pit.h
Kbuild
a.out.h
abs_addr.h
agp.h
asm-compat.h
atomic.h
auxvec.h
backlight.h
bitops.h
bootx.h
btext.h
bug.h
bugs.h
byteorder.h
cache.h [POWERPC] Add __read_mostly support for powerpc 2007-07-10 22:00:56 +10:00
cacheflush.h
cell-pmu.h
checksum.h
compat.h Introduce compat_u64 and compat_s64 types 2007-07-16 09:05:48 -07:00
cputable.h [POWERPC] Consolidate PowerPC 750 cputable features 2007-07-10 21:55:50 +10:00
cputime.h
current.h
dbdma.h
dcr-mmio.h
dcr-native.h
dcr.h
delay.h
device.h
div64.h
dma-mapping.h PCI: remove pci_dac_dma_... APIs 2007-07-11 16:02:11 -07:00
dma.h
edac.h
eeh.h
eeh_event.h
elf.h
emergency-restart.h
errno.h
fcntl.h
firmware.h
floppy.h [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
fs_pd.h
futex.h
grackle.h
hardirq.h
heathrow.h
hvcall.h [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number 2007-07-11 13:24:40 +10:00
hvconsole.h
hvcserver.h
hw_irq.h powerpc: fixup hard_irq_disable semantics 2007-05-11 08:29:34 -07:00
i8259.h
ibmebus.h
ide.h
immap_86xx.h
immap_qe.h
io-defs.h
io.h [POWERPC] Abolish iopa(), mm_ptov(), io_block_mapping() from arch/powerpc 2007-06-14 22:30:15 +10:00
ioctl.h
ioctls.h
iommu.h
ipc.h
ipcbuf.h
ipic.h
irq.h [POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver 2007-07-02 13:29:21 +10:00
irq_regs.h
irqflags.h
kdebug.h
kdump.h
kexec.h
keylargo.h
kmap_types.h
kprobes.h
libata-portmap.h
linkage.h
lmb.h
local.h
lppaca.h [POWERPC] Donate idle CPU cycles on dedicated partitions 2007-06-14 22:29:58 +10:00
lv1call.h [POWERPC] PS3: System-bus rework 2007-06-28 19:16:38 +10:00
machdep.h [POWERPC] Pass the pci_controller into pci_exclude_device 2007-06-29 01:57:22 -05:00
macio.h
mc146818rtc.h
mediabay.h
mman.h
mmu-8xx.h [POWERPC] Split out asm-ppc/mmu.h portions for PowerPC 8xx 2007-07-03 03:00:28 -05:00
mmu-44x.h [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error 2007-05-17 21:11:13 +10:00
mmu-fsl-booke.h [POWERPC] Split out asm-ppc/mmu.h portions for Freescale Book-E 2007-07-03 03:00:16 -05:00
mmu-hash32.h [POWERPC] Kill typedef-ed structs for hash PTEs and BATs 2007-06-14 22:30:16 +10:00
mmu-hash64.h [POWERPC] Fix Kexec/Kdump for power6 2007-06-25 17:03:33 +10:00
mmu.h [POWERPC] Split out asm-ppc/mmu.h portions for PowerPC 8xx 2007-07-03 03:00:28 -05:00
mmu_context.h [POWERPC] Merge asm-ppc/mmu_context.h into asm-power/mmu_context.h 2007-07-03 03:22:05 -05:00
mmzone.h [POWERPC] We don't define CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID 2007-05-10 21:28:13 +10:00
module.h
mpc8xx.h [POWERPC] 8xx: mpc885ads pcmcia support 2007-07-10 00:33:51 -05:00
mpc52xx.h
mpc85xx.h
mpc86xx.h [POWERPC] kill isa_{io,mem}_base definitions for !PCI 2007-06-29 01:56:43 -05:00
mpc8260.h [POWERPC] Change include protections to ASM_POWERPC 2007-05-17 21:10:15 +10:00
mpic.h
msgbuf.h
mutex.h
namei.h
nvram.h
of_device.h
of_platform.h
ohare.h
oprofile_impl.h
pSeries_reconfig.h
paca.h
page.h
page_32.h
page_64.h
param.h
parport.h
pci-bridge.h [POWERPC] Use ppc64 style list management for pci_controller on ppc32 2007-06-29 01:58:45 -05:00
pci.h Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-07-16 17:58:08 -07:00
percpu.h
pgalloc-32.h
pgalloc-64.h [POWERPC] Fix return from pte_alloc_one() in out-of-memory case 2007-06-02 21:01:56 +10:00
pgalloc.h
pgtable-4k.h
pgtable-64k.h
pgtable-ppc32.h Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-07-16 17:58:08 -07:00
pgtable-ppc64.h Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-07-16 17:58:08 -07:00
pgtable.h [POWERPC] Start factoring pgtable-ppc32.h and pgtable-ppc64.h 2007-06-14 22:30:15 +10:00
pmac_feature.h [POWERPC] Change include protections to ASM_POWERPC 2007-05-17 21:10:15 +10:00
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h Consolidate asm/poll.h 2007-05-11 08:29:34 -07:00
posix_types.h
ppc-pci.h [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
ppc_asm.h
processor.h [POWERPC] Abolish unused ucBoardRev variables 2007-06-28 19:19:29 +10:00
prom.h [POWERPC] Add a warning to help trackdown device_node refcounting bugs 2007-07-10 21:53:47 +10:00
ps3.h [POWERPC] PS3: Preallocate bootmem memory for the PS3 FLASH ROM storage driver 2007-06-28 19:18:08 +10:00
ps3av.h [POWERPC] PS3: Rework AV settings driver 2007-06-28 19:16:42 +10:00
ps3fb.h [POWERPC] PS3: Frame buffer system-bus rework 2007-06-28 19:16:42 +10:00
ps3stor.h [POWERPC] PS3: Storage Driver Core 2007-06-28 19:19:20 +10:00
ptrace.h [POWERPC] Uninline common ptrace bits 2007-06-14 22:29:57 +10:00
qe.h [POWERPC] Change rheap functions to use ulongs instead of pointers 2007-05-09 23:01:43 -05:00
qe_ic.h
reg.h [POWERPC] Oprofile enhanced instruction sampling support 2007-07-10 21:55:48 +10:00
reg_8xx.h
reg_booke.h [POWERPC] Move reg_booke.h to include/asm-powerpc 2007-05-09 23:00:37 -05:00
resource.h
rheap.h [POWERPC] User rheap from arch/powerpc/lib 2007-05-09 23:28:17 -05:00
rtas.h
rtc.h
rwsem.h
scatterlist.h
seccomp.h
sections.h
semaphore.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
smu.h
socket.h
sockios.h
sparsemem.h
spinlock.h
spinlock_types.h
spu.h [POWERPC] spufs: Add spu stats in sysfs 2007-07-03 15:24:46 +10:00
spu_csa.h
spu_info.h
spu_priv1.h
sstep.h
stat.h
statfs.h
string.h
suspend.h
synch.h
syscalls.h [POWERPC] Consolidate sys_sigaltstack 2007-06-14 22:29:57 +10:00
systbl.h Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM 2007-06-28 11:38:30 -07:00
system.h [POWERPC] Make the debugfs "powerpc" dir globally accessible 2007-07-10 21:53:50 +10:00
tce.h
termbits.h [POWERPC] Enable arbitary speed tty ioctls and split input/output speed 2007-07-10 22:03:29 +10:00
termios.h
thread_info.h [POWERPC] Reserve threadinfo flags for perfmon2 2007-06-14 22:29:55 +10:00
time.h [POWERPC] Move iSeries_tb_recal into its own late_initcall. 2007-06-28 19:19:23 +10:00
timex.h
tlb.h [POWERPC] Fix possible access to free pages 2007-06-02 21:01:55 +10:00
tlbflush.h [POWERPC] Rewrite IO allocation & mapping on powerpc64 2007-06-14 22:29:56 +10:00
topology.h
tsi108.h
tsi108_irq.h [POWERPC] Change include protections to ASM_POWERPC 2007-05-17 21:10:15 +10:00
tsi108_pci.h [POWERPC] Change include protections to ASM_POWERPC 2007-05-17 21:10:15 +10:00
types.h
uaccess.h
ucc.h
ucc_fast.h
ucc_slow.h
ucontext.h
udbg.h
uic.h
unaligned.h
uninorth.h
unistd.h Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM 2007-06-28 11:38:30 -07:00
user.h
vdso.h
vdso_datapage.h
vga.h
vio.h
xmon.h
xor.h