Ingo Molnar f541ae326f Merge branch 'linus' into perfcounters/core-v2 ... Merge reason: we have gathered quite a few conflicts, need to merge upstream Conflicts: arch/powerpc/kernel/Makefile arch/x86/ia32/ia32entry.S arch/x86/include/asm/hardirq.h arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/cpu/common.c arch/x86/kernel/irq.c arch/x86/kernel/syscall_table_32.S arch/x86/mm/iomap_32.c include/linux/sched.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-04-06 09:02:57 +02:00
..
iseries
8xx_immap.h
8253pit.h
abs_addr.h
agp.h
asm-compat.h
atomic.h	atomic_t: unify all arch definitions	2009-01-06 15:59:10 -08:00
auxvec.h
backlight.h
bitops.h
bootx.h	powerpc: Fix warnings from make headers_check	2009-02-23 10:48:57 +11:00
btext.h
bug.h	powerpc: Fix asm EMIT_BUG_ENTRY with !CONFIG_BUG	2008-12-16 15:53:23 +11:00
bugs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h
cacheflush.h
cell-pmu.h	powerpc/oprofile: IBM CELL: add SPU event profiling support	2009-01-08 15:51:55 +01:00
cell-regs.h
checksum.h
clk_interface.h
code-patching.h	powerpc: Unify opcode definitions and support	2009-02-23 10:48:56 +11:00
compat.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
cpm.h
cpm1.h
cpm2.h	fs_enet: Fix SCC Ethernet on CPM2, and crash in fs_enet_rx_napi()	2008-08-27 05:16:38 -04:00
cputable.h	Merge commit 'origin/master' into next	2009-03-24 13:38:30 +11:00
cputhreads.h
cputime.h
current.h
dbdma.h
dbell.h	powerpc: Add support for using doorbells for SMP IPI	2009-02-23 15:53:03 +11:00
dcr-generic.h
dcr-mmio.h
dcr-native.h	powerpc/4xx: Extended DCR support v2	2008-12-21 14:21:15 +11:00
dcr-regs.h	ibm_newemac: Fix EMAC soft reset on 460EX/GT	2008-10-08 15:27:14 -07:00
dcr.h	powerpc: Const-qualify Device Node Argument to DCR Resource Extent API	2008-12-21 14:21:16 +11:00
delay.h
device.h	powerpc and sparc: Introduce dev_archdata node accessors	2008-12-03 21:03:54 +11:00
disassemble.h	ppc: Create disassemble.h to extract instruction fields	2008-12-31 16:52:21 +02:00
div64.h
dma-mapping.h	powerpc: expect all devices calling dma ops to have archdata set	2009-03-24 13:47:31 +11:00
dma.h
edac.h
eeh.h	powerpc/pci: Split pcibios_fixup_bus() into bus setup and device setup	2008-11-06 09:22:37 +11:00
eeh_event.h
elf.h	powerpc: Randomise PIEs	2009-02-23 15:53:21 +11:00
emergency-restart.h
errno.h
exception.h	powerpc: Make it possible to move the interrupt handlers away from the kernel	2008-09-15 11:08:08 -07:00
fb.h
fcntl.h
feature-fixups.h	powerpc/mm: Introduce MMU features	2008-12-21 14:21:16 +11:00
firmware.h
fixmap.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
floppy.h
fs_pd.h
fsl_gtm.h
fsl_lbc.h	powerpc: fix fsl_upm nand driver modular build	2008-10-13 11:48:24 -05:00
ftrace.h	powerpc32, ftrace: save and restore mcount regs with macro	2009-02-23 10:48:54 +11:00
futex.h
gpio.h
grackle.h
hardirq.h
heathrow.h
highmem.h	mm: use debug_kmap_atomic	2009-04-01 08:59:14 -07:00
hugetlb.h	mm: report the MMU pagesize in /proc/pid/smaps	2009-01-06 15:58:58 -08:00
hvcall.h	powerpc: Make CMO paging space pool ID and page size available	2008-08-18 14:22:34 +10:00
hvconsole.h
hvcserver.h
hw_irq.h	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
hydra.h
i8259.h
ibmebus.h
ide.h	cleanup powerpc/include/asm/ide.h	2008-08-18 21:40:03 +02:00
immap_86xx.h
immap_cpm2.h	powerpc: Update QE/CPM2 usb_ctlr structures for USB support	2008-11-08 12:39:02 -06:00
immap_qe.h	powerpc: Update QE/CPM2 usb_ctlr structures for USB support	2008-11-08 12:39:02 -06:00
io-defs.h
io.h	powerpc: Wire up /proc/vmallocinfo to our ioremap()	2009-03-11 17:10:14 +11:00
ioctl.h
ioctls.h	powerpc: Add ioctls for RS485 mode control of serial drivers	2009-01-08 16:25:12 +11:00
iommu.h	powerpc: Update remaining dma_mapping_ops to use map/unmap_page	2008-10-31 16:13:48 +11:00
ipcbuf.h
ipic.h
irq.h	powerpc: Separate the irq radix tree insertion and lookup	2008-09-15 11:08:44 -07:00
irq_regs.h
irqflags.h	powerpc: Fix lockdep IRQ tracing bug	2008-08-18 14:22:34 +10:00
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h
kdump.h	powerpc/32: Wire up the trampoline code for kdump	2008-12-23 15:13:29 +11:00
kexec.h	powerpc/kdump: Use ppc_save_regs() in crash_setup_regs()	2009-01-08 16:25:17 +11:00
keylargo.h
kgdb.h
kmap_types.h
kprobes.h
kvm.h	Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:11:41 -07:00
kvm_44x.h	KVM: ppc: move struct kvmppc_44x_tlbe into 44x-specific header	2009-03-24 11:02:55 +02:00
kvm_asm.h	KVM: ppc: Add extra E500 exceptions	2009-03-24 11:02:59 +02:00
kvm_e500.h	KVM: ppc: E500 core-specific code	2009-03-24 11:02:58 +02:00
kvm_host.h	KVM: ppc: remove debug support broken by KVM debug rewrite	2009-03-24 11:03:01 +02:00
kvm_para.h
kvm_ppc.h	KVM: ppc: remove debug support broken by KVM debug rewrite	2009-03-24 11:03:01 +02:00
libata-portmap.h
linkage.h
lmb.h
local.h	powerpc: Tell gcc when we clobber the carry in inline asm	2008-11-19 16:04:28 +11:00
lppaca.h	powerpc: Add dispatch trace log fields to lppaca	2009-03-24 13:47:27 +11:00
lv1call.h
machdep.h	powerpc: Wire up /proc/vmallocinfo to our ioremap()	2009-03-11 17:10:14 +11:00
macio.h
mc146818rtc.h
mediabay.h
mman.h	powerpc: Get USE_STRICT_MM_TYPECHECKS working again	2008-10-14 10:35:27 +11:00
mmu-8xx.h	powerpc/mm: Rework context management for CPUs with no hash table	2008-12-21 14:21:15 +11:00
mmu-40x.h	powerpc/mm: Rework context management for CPUs with no hash table	2008-12-21 14:21:15 +11:00
mmu-44x.h	powerpc/44x: Support for 256KB PAGE_SIZE	2009-02-14 14:40:04 -05:00
mmu-book3e.h	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
mmu-hash32.h
mmu-hash64.h	powerpc/mm: Introduce early_init_mmu() on 64-bit	2009-03-24 13:47:34 +11:00
mmu.h	powerpc/mm: Introduce early_init_mmu() on 64-bit	2009-03-24 13:47:34 +11:00
mmu_context.h	cpumask: Use mm_cpumask() wrapper instead of cpu_vm_mask	2009-03-24 13:47:29 +11:00
mmzone.h	numa, cpumask: move numa_node_id default implementation to topology.h, fix	2009-03-19 12:51:25 +01:00
module.h	powerpc/ppc32: ftrace, dynamic ftrace to handle modules	2008-11-20 10:52:53 -08:00
mpc6xx.h
mpc8xx.h
mpc52xx.h	powerpc/5200: add function to return external clock frequency	2009-03-11 09:36:26 -06:00
mpc52xx_psc.h	powerpc/mpc5200: add rts/cts handling in PSC UART driver	2008-12-21 02:54:32 -07:00
mpc86xx.h
mpc512x.h
mpc8260.h
mpic.h	powerpc/mpic: Fix regression caused by change of default IRQ affinity	2008-10-31 16:13:50 +11:00
msgbuf.h
msi_bitmap.h	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
mutex.h	powerpc: Optimise mutex	2008-11-19 16:04:58 +11:00
nvram.h
of_device.h	powerpc: Remove include of linux/of_device.h from asm/of_device.h	2008-08-20 16:34:59 +10:00
of_platform.h	powerpc: Remove include of linux/of_platform.h from asm/of_platform.h	2008-08-20 16:34:58 +10:00
ohare.h
oprofile_impl.h	powerpc/oprofile: IBM CELL: add SPU event profiling support	2009-01-08 15:51:55 +01:00
paca.h	powerpc: Provide a way to defer perf counter work until interrupts are enabled	2009-01-09 19:48:17 +11:00
page.h	powerpc/44x: Support for 256KB PAGE_SIZE	2009-02-14 14:40:04 -05:00
page_32.h	powerpc/44x: Support for 256KB PAGE_SIZE	2009-02-14 14:40:04 -05:00
page_64.h
param.h
parport.h
pasemi_dma.h
pci-bridge.h	powerpc: Introduce ppc_pci_flags accessors	2008-12-16 15:53:16 +11:00
pci.h	PCI/MSI: Use #ifdefs instead of weak functions	2009-03-19 19:29:26 -07:00
percpu.h
perf_counter.h	powerpc/perf_counter: Add generic support for POWER-family PMU hardware	2009-01-10 16:32:05 +11:00
pgalloc-32.h	powerpc: Use RCU based pte freeing mechanism for all powerpc	2008-12-03 20:46:35 +11:00
pgalloc-64.h	powerpc: Use RCU based pte freeing mechanism for all powerpc	2008-12-03 20:46:35 +11:00
pgalloc.h	powerpc: Use RCU based pte freeing mechanism for all powerpc	2008-12-03 20:46:35 +11:00
pgtable-ppc32.h	powerpc/mm: Merge various PTE bits and accessors definitions	2009-03-24 13:47:33 +11:00
pgtable-ppc64-4k.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pgtable-ppc64-64k.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pgtable-ppc64.h	powerpc/mm: Add option for non-atomic PTE updates to ppc64	2009-03-24 13:47:34 +11:00
pgtable.h	powerpc/mm: Merge various PTE bits and accessors definitions	2009-03-24 13:47:33 +11:00
phyp_dump.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h
ppc-opcode.h	powerpc: Unify opcode definitions and support	2009-02-23 10:48:56 +11:00
ppc-pci.h
ppc4xx.h
ppc_asm.h	powerpc: Unify opcode definitions and support	2009-02-23 10:48:56 +11:00
processor.h	powerpc: Sanitize stack pointer in signal handling code	2009-03-27 16:58:24 +11:00
prom.h	powerpc: Add of_find_next_cache_node()	2008-12-21 14:21:14 +11:00
ps3.h	powerpc/ps3: Add rtc-ps3	2009-04-02 01:05:32 +00:00
ps3av.h	powerpc/ps3: Make ps3av_set_video_mode mode ID signed	2009-03-11 17:10:17 +11:00
ps3fb.h	Merge commit 'origin/master' into next	2009-03-30 14:04:53 +11:00
ps3stor.h
pSeries_reconfig.h
pte-8xx.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
pte-40x.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pte-44x.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pte-common.h	powerpc/mm: Merge various PTE bits and accessors definitions	2009-03-24 13:47:33 +11:00
pte-fsl-booke.h	powerpc/mm: Unify PTE_RPN_SHIFT and _PAGE_CHG_MASK definitions	2009-03-20 15:56:58 +11:00
pte-hash32.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
pte-hash64-4k.h	powerpc/mm: Tweak PTE bit combination definitions	2009-03-24 13:47:33 +11:00
pte-hash64-64k.h	powerpc/mm: Split the various pgtable-* headers based on MMU type	2009-03-20 15:56:57 +11:00
pte-hash64.h	powerpc/mm: Add option for non-atomic PTE updates to ppc64	2009-03-24 13:47:34 +11:00
ptrace.h	remove __ARCH_WANT_COMPAT_SYS_PTRACE	2008-11-30 11:00:15 -08:00
qe.h	powerpc/qe: add Ethernet UPSMR definitions to QE library	2009-01-07 09:18:53 -06:00
qe_ic.h	powerpc/qe: Fix few build errors with CONFIG_QUICC_ENGINE=n	2008-12-30 11:14:06 -06:00
reg.h	powerpc: Add missing DABR flags	2009-03-11 17:10:16 +11:00
reg_8xx.h
reg_booke.h	powerpc: Add defintion for MSR[GS] to list of MSR bits	2009-03-11 17:10:16 +11:00
reg_fsl_emb.h
resource.h
rheap.h
rio.h
rtas.h	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
rtc.h
rwsem.h
scatterlist.h
seccomp.h	x86-64: seccomp: fix 32/64 syscall hole	2009-03-02 15:41:30 -08:00
sections.h	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
sembuf.h
serial.h
setjmp.h
setup.h
sfp-machine.h	powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.	2008-12-03 08:19:16 -06:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h	signals: demultiplexing SIGTRAP signal	2008-09-23 13:26:52 +02:00
signal.h	x86, um: get rid of uml signal.h	2008-10-22 22:55:20 -07:00
smp.h	powerpc: Provide a separate handler for each IPI action	2008-11-19 16:05:06 +11:00
smu.h
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h
sparsemem.h
spinlock.h	Allow rwlocks to re-enable interrupts	2009-04-02 19:05:11 -07:00
spinlock_types.h
spu.h	powerpc/cell: Bitops work on unsigned longs	2009-01-08 16:25:12 +11:00
spu_csa.h
spu_info.h	powerpc: Fix warnings from make headers_check	2009-02-23 10:48:57 +11:00
spu_priv1.h
sstep.h
stat.h
statfs.h	PowerPC: Use <asm-generic/statfs.h>	2008-09-06 19:30:15 +01:00
string.h
suspend.h	pm: cleanup includes	2009-04-01 08:59:16 -07:00
swab.h	powerpc: Fix warnings from make headers_check	2009-02-23 10:48:57 +11:00
synch.h	powerpc: Optimise smp_wmb	2008-11-19 16:04:55 +11:00
syscall.h
syscalls.h
systbl.h	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
system.h	powerpc: Randomise lower bits of stack address	2009-02-23 15:53:20 +11:00
tce.h
termbits.h
termios.h
thread_info.h	Merge commit 'jwb/next' into next	2009-03-03 13:30:03 +11:00
time.h	powerpc: Eliminate unused do_gtod variable	2008-11-06 09:49:28 +11:00
timex.h
tlb.h
tlbflush.h	powerpc/mm: Split low level tlb invalidate for nohash processors	2008-12-21 14:21:16 +11:00
topology.h	cpumask: remove node_to_first_cpu	2009-03-30 22:05:12 +10:30
tsi108.h
tsi108_irq.h
tsi108_pci.h
types.h	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
uaccess.h
ucc.h
ucc_fast.h
ucc_slow.h
ucontext.h
udbg.h	powerpc/udbg: Fix lost byte during console handover; change LFCR to CRLF	2009-03-11 17:11:34 +11:00
uic.h
unaligned.h
uninorth.h
unistd.h	powerpc/perf_counter: Add perf_counter system call on powerpc	2009-01-09 18:27:53 +11:00
user.h
vdso.h
vdso_datapage.h	powerpc: Improve resolution of VDSO clock_gettime	2008-11-06 09:49:22 +11:00
vga.h
vio.h
xilinx_intc.h
xmon.h
xor.h