OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux-stable-rt/include/asm-powerpc
History
Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h
 		2006-06-22 22:11:30 -07:00
..
iseries Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
8253pit.h
…
a.out.h
…
abs_addr.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
agp.h
…
asm-compat.h
…
atomic.h
…
auxvec.h
…
backlight.h
…
bitops.h [PATCH] remove powerpc bitops in favor of existing generic bitops 2006-05-24 16:08:58 +10:00
bootx.h
…
btext.h
…
bug.h
…
bugs.h
…
byteorder.h
…
cache.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
cacheflush.h
…
checksum.h
…
compat.h
…
cputable.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
cputime.h
…
current.h
…
dbdma.h
…
delay.h [POWERPC] Fix mdelay badness on shared processor partitions 2006-06-21 15:01:33 +10:00
div64.h
…
dma-mapping.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
dma.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
eeh.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
eeh_event.h [PATCH] powerpc/pseries: clear PCI failure counter if no new failures 2006-04-22 18:46:13 +10:00
elf.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
emergency-restart.h
…
errno.h
…
fcntl.h
…
firmware.h
…
floppy.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
futex.h
…
grackle.h
…
hardirq.h
…
heathrow.h
…
hvcall.h [POWERPC] check firmware state before suspending 2006-06-15 19:31:27 +10:00
hvconsole.h
…
hvcserver.h
…
hw_irq.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
i8259.h
…
ibmebus.h
…
ide.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
immap_86xx.h [POWERPC] Add 8641 Register space and IRQ definitions. 2006-06-21 15:01:28 +10:00
io.h Merge branch 'merge' 2006-04-29 16:15:57 +10:00
ioctl.h
…
ioctls.h
…
iommu.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
ipc.h
…
ipcbuf.h
…
ipic.h
…
irq.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
kdebug.h
…
kdump.h [PATCH] powerpc: Kdump header cleanup 2006-05-19 15:02:16 +10:00
kexec.h [PATCH] powerpc: Move crashkernel= handling into the kernel. 2006-05-19 15:02:18 +10:00
keylargo.h
…
kmap_types.h
…
kprobes.h
…
linkage.h
…
lmb.h
…
local.h
…
lppaca.h
…
machdep.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
macio.h
…
mc146818rtc.h
…
mediabay.h
…
mman.h
…
mmu.h powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
mmu_context.h powerpc: Remove unused paca->pgdir field 2006-06-12 18:38:21 +10:00
mmzone.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
module.h
…
mpc86xx.h [POWERPC] Add 8641 Register space and IRQ definitions. 2006-06-21 15:01:28 +10:00
mpic.h [POWERPC] mpic: add support for serial mode interrupts 2006-06-21 15:01:32 +10:00
msgbuf.h
…
mutex.h
…
namei.h
…
nvram.h
…
of_device.h
…
ohare.h
…
oprofile_impl.h
…
pSeries_reconfig.h
…
paca.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
page.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
page_32.h
…
page_64.h [PATCH] powerpc: Fix pagetable bloat for hugepages 2006-04-28 15:02:51 +10:00
param.h
…
parport.h
…
pci-bridge.h [POWERPC] pcibus_to_node fixes 2006-06-15 19:31:26 +10:00
pci.h
…
percpu.h
…
pgalloc.h [PATCH] powerpc: Fix pagetable bloat for hugepages 2006-04-28 15:02:51 +10:00
pgtable-4k.h powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
pgtable-64k.h powerpc: Use 64k pages without needing cache-inhibited large pages 2006-06-15 10:45:18 +10:00
pgtable.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
pmac_feature.h
…
pmac_low_i2c.h
…
pmac_pfunc.h
…
pmc.h
…
poll.h
…
posix_types.h
…
ppc-pci.h
…
ppc_asm.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
processor.h [POWERPC] disable floating point exceptions for init 2006-06-21 15:01:33 +10:00
prom.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
ptrace.h [PATCH] powerpc: enable PPC_PTRACE_[GS]ETREGS on ppc32 2006-06-09 21:20:51 +10:00
reg.h [POWERPC] cell: add RAS support 2006-06-21 15:01:29 +10:00
reg_8xx.h
…
resource.h
…
rtas.h [POWERPC] check firmware state before suspending 2006-06-15 19:31:27 +10:00
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 Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
smu.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
socket.h
…
sockios.h
…
sparsemem.h
…
spinlock.h
…
spinlock_types.h
…
spu.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
spu_csa.h [POWERPC] spufs: one more fix for 64k pages 2006-06-21 15:01:32 +10:00
spu_priv1.h [POWERPC] spufs: fix spu irq affinity setting 2006-06-21 15:01:31 +10:00
sstep.h
…
stat.h
…
statfs.h
…
string.h
…
synch.h
…
syscalls.h
…
systbl.h [POWERPC] Unify ppc syscall tables 2006-06-21 15:01:32 +10:00
system.h
…
tce.h [PATCH] powerpc: kill union tce_entry 2006-04-29 18:07:54 +10:00
termbits.h [PATCH] Add CMSPAR to termbits.h for powerpc and alpha 2006-05-26 11:55:46 -07:00
termios.h
…
thread_info.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
time.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
timex.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
tlb.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
tlbflush.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
topology.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
types.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
uaccess.h powerpc: Fix incorrect might_sleep in __get_user/__put_user on kernel addresses 2006-05-03 23:06:46 +10:00
ucontext.h
…
udbg.h [PATCH] powerpc: udbg_printf() formatting attribute 2006-05-19 15:02:19 +10:00
unaligned.h
…
uninorth.h
…
unistd.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-05-24 09:22:21 +01:00
user.h
…
vdso.h
…
vdso_datapage.h
…
vga.h [PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use 2006-06-22 15:05:58 -07:00
vio.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
xmon.h
…
xor.h
…