Linus Torvalds a591afc01d Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull x32 support for x86-64 from Ingo Molnar: "This tree introduces the X32 binary format and execution mode for x86: 32-bit data space binaries using 64-bit instructions and 64-bit kernel syscalls. This allows applications whose working set fits into a 32 bits address space to make use of 64-bit instructions while using a 32-bit address space with shorter pointers, more compressed data structures, etc." Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c} * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits) x32: Fix alignment fail in struct compat_siginfo x32: Fix stupid ia32/x32 inversion in the siginfo format x32: Add ptrace for x32 x32: Switch to a 64-bit clock_t x32: Provide separate is_ia32_task() and is_x32_task() predicates x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls x86/x32: Fix the binutils auto-detect x32: Warn and disable rather than error if binutils too old x32: Only clear TIF_X32 flag once x32: Make sure TS_COMPAT is cleared for x32 tasks fs: Remove missed ->fds_bits from cessation use of fd_set structs internally fs: Fix close_on_exec pointer in alloc_fdtable x32: Drop non-__vdso weak symbols from the x32 VDSO x32: Fix coding style violations in the x32 VDSO code x32: Add x32 VDSO support x32: Allow x32 to be configured x32: If configured, add x32 system calls to system call tables x32: Handle process creation x32: Signal-related system calls x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h> ...		2012-03-29 18:12:23 -07:00
..
8xx_immap.h
abs_addr.h	powerpc: Remove FW_FEATURE ISERIES from arch code	2012-03-21 11:16:11 +11:00
agp.h
asm-compat.h
asm-offsets.h
async_tx.h
atomic.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
auxvec.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
backlight.h
barrier.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
bitops.h
bitsperlong.h
bootx.h
btext.h
bug.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
bugs.h
byteorder.h
cache.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
cacheflush.h
cell-pmu.h
cell-regs.h
checksum.h
clk_interface.h
cmpxchg.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
code-patching.h
compat.h
cpm1.h
cpm2.h
cpm.h
cputable.h	powerpc: Add initial e6500 cpu support	2012-03-15 12:12:21 -05:00
cputhreads.h
cputime.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-01-06 17:58:22 -08:00
current.h
dbdma.h
dbell.h
dcr-generic.h
dcr-mmio.h
dcr-native.h
dcr-regs.h
dcr.h
debug.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
delay.h
device.h	powerpc/eeh: Introduce EEH device	2012-03-09 11:39:29 +11:00
disassemble.h
div64.h
dma-mapping.h
dma.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
edac.h
eeh_event.h	powerpc/eeh: Replace pci_dn with eeh_dev for EEH aux components	2012-03-09 11:39:46 +11:00
eeh.h	powerpc/eeh: pseries platform config space access in EEH	2012-03-09 11:39:51 +11:00
ehv_pic.h	irq_domain/powerpc: Use common irq_domain structure instead of irq_host	2012-02-14 14:06:50 -07:00
elf.h
emergency-restart.h
emulated_ops.h
epapr_hcalls.h
errno.h
exception-64e.h
exception-64s.h	powerpc: Rework lazy-interrupt handling	2012-03-09 13:25:06 +11:00
exec.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
fadump.h	fadump: Invalidate registration and release reserved memory for general use.	2012-02-23 10:50:02 +11:00
fb.h
fcntl.h
feature-fixups.h
firmware.h	powerpc: Remove FW_FEATURE ISERIES from arch code	2012-03-21 11:16:11 +11:00
fixmap.h
floppy.h
fs_pd.h
fsl_85xx_cache_sram.h
fsl_gtm.h
fsl_guts.h	powerpc/85xx: Abstract common define of signal multiplex control for qe	2012-03-16 14:59:38 -05:00
fsl_hcalls.h
fsl_ifc.h	powerpc/fsl: Add support for Integrated Flash Controller	2012-01-04 15:41:22 -06:00
fsl_lbc.h
ftrace.h
futex.h
gpio.h
grackle.h
hardirq.h
heathrow.h
highmem.h	highmem: kill all __kmap_atomic()	2012-03-20 21:48:30 +08:00
hugetlb.h
hvcall.h
hvconsole.h
hvcserver.h
hvsi.h
hw_breakpoint.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
hw_irq.h	powerpc: Rework lazy-interrupt handling	2012-03-09 13:25:06 +11:00
hydra.h
i8259.h	irq_domain/powerpc: Use common irq_domain structure instead of irq_host	2012-02-14 14:06:50 -07:00
ibmebus.h
ide.h
immap_cpm2.h
immap_qe.h
io_event_irq.h
io-defs.h
io-workarounds.h
io.h
ioctl.h
ioctls.h
iommu.h	powerpc: Random little legacy iSeries removal tidy ups	2012-03-28 11:33:23 +11:00
ipcbuf.h
ipic.h
irq_regs.h
irq.h	powerpc: Remove NO_IRQ_IGNORE	2012-03-28 11:32:01 +11:00
irqflags.h	powerpc: Rework lazy-interrupt handling	2012-03-09 13:25:06 +11:00
jump_label.h	static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()	2012-02-24 10:05:59 +01:00
Kbuild
kdebug.h
kdump.h
kexec.h
keylargo.h	Typos: change aditional to additional.	2012-02-21 11:40:36 +01:00
kgdb.h
kmap_types.h
kprobes.h
kvm_44x.h
kvm_asm.h
kvm_book3s_32.h	KVM: PPC: Use get/set for to_svcpu to help preemption	2012-03-05 14:52:30 +02:00
kvm_book3s_64.h	KVM: PPC: Allow for read-only pages backing a Book3S HV guest	2012-03-05 14:52:38 +02:00
kvm_book3s_asm.h
kvm_book3s.h	KVM: PPC: Add support for explicit HIOR setting	2012-03-05 14:52:41 +02:00
kvm_booke.h
kvm_e500.h	KVM: PPC: Paravirtualize SPRG4-7, ESR, PIR, MASn	2012-03-05 14:52:26 +02:00
kvm_fpu.h
kvm_host.h	KVM: Introduce kvm_memory_slot::arch and move lpage_info into it	2012-03-08 14:10:22 +02:00
kvm_para.h	KVM: PPC: refer to paravirt docs in header file	2012-03-05 14:52:41 +02:00
kvm_ppc.h	KVM: PPC: Add HPT preallocator	2012-03-05 14:57:28 +02:00
kvm.h	KVM: PPC: Rename MMIO register identifiers	2012-03-05 14:52:41 +02:00
libata-portmap.h
linkage.h
local64.h
local.h
lppaca.h	powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces	2012-03-21 11:16:12 +11:00
lv1call.h
machdep.h	powerpc: Remove NO_IRQ_IGNORE	2012-03-28 11:32:01 +11:00
macio.h
mc146818rtc.h
mediabay.h
mman.h
mmu_context.h
mmu-8xx.h
mmu-40x.h
mmu-44x.h
mmu-book3e.h	KVM: PPC: e500: use hardware hint when loading TLB0 entries	2012-03-05 14:52:34 +02:00
mmu-hash32.h
mmu-hash64.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-03-28 14:41:36 -07:00
mmu.h
mmzone.h
module.h
mpc5xxx.h
mpc6xx.h
mpc8xx.h
mpc52xx_psc.h
mpc52xx.h
mpc5121.h
mpc8260.h
mpic_msgr.h	powerpc: add support for MPIC message register API	2012-03-16 16:15:28 -05:00
mpic.h	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2012-03-21 18:55:10 -07:00
msgbuf.h
msi_bitmap.h
mutex.h
nvram.h
ohare.h
opal.h
oprofile_impl.h
paca.h	powerpc: Rework lazy-interrupt handling	2012-03-09 13:25:06 +11:00
page_32.h
page_64.h
page.h
param.h
parport.h
pasemi_dma.h
pci-bridge.h	powerpc/eeh: Remove eeh information from pci_dn	2012-03-28 11:31:57 +11:00
pci.h	powerpc/PCI: compute I/O space bus-to-resource offset consistently	2012-03-20 10:41:44 -07:00
percpu.h
perf_event_fsl_emb.h
perf_event_server.h	powerpc/perf: Fix instruction address sampling on 970 and Power4	2012-03-28 11:33:24 +11:00
perf_event.h
pgalloc-32.h
pgalloc-64.h
pgalloc.h
pgtable-ppc32.h
pgtable-ppc64-4k.h
pgtable-ppc64-64k.h
pgtable-ppc64.h
pgtable.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
poll.h
posix_types.h	powerpc: Use generic posix_types.h	2012-02-14 12:01:29 -08:00
ppc4xx.h
ppc_asm.h	powerpc: Fix register clobbering when accumulating stolen time	2012-03-09 10:55:16 +11:00
ppc-opcode.h	KVM: PPC: Implement MMIO emulation support for Book3S HV guests	2012-03-05 14:52:37 +02:00
ppc-pci.h	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
processor.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
prom.h
ps3.h
ps3av.h
ps3fb.h
ps3gpu.h
ps3stor.h
pSeries_reconfig.h
pte-8xx.h
pte-40x.h
pte-44x.h
pte-book3e.h
pte-common.h
pte-fsl-booke.h
pte-hash32.h
pte-hash64-4k.h
pte-hash64-64k.h
pte-hash64.h
ptrace.h	powerpc: Implement GET_IP/SET_IP	2012-02-14 15:01:38 +11:00
qe_ic.h
qe.h
reg_8xx.h
reg_a2.h
reg_booke.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
reg_fsl_emb.h
reg.h	Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-03-28 14:35:31 -07:00
resource.h
rheap.h
rio.h
rtas.h	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
rtc.h
runlatch.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
scatterlist.h
scom.h
seccomp.h
sections.h
sembuf.h
serial.h
setjmp.h
setup.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
sfp-machine.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h	powerpc: Random little legacy iSeries removal tidy ups	2012-03-28 11:33:23 +11:00
smu.h
socket.h	net: Add framework to allow sending packets with customized CRC.	2012-02-24 01:37:35 -08:00
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h	powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces	2012-03-21 11:16:12 +11:00
spu_csa.h
spu_info.h
spu_priv1.h
spu.h	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
sstep.h
stat.h
statfs.h
string.h
swab.h
swiotlb.h
switch_to.h	Disintegrate asm/system.h for PowerPC	2012-03-28 18:30:02 +01:00
synch.h
syscall.h
syscalls.h
systbl.h
tce.h
termbits.h
termios.h
thread_info.h	powerpc: Rework runlatch code	2012-03-09 10:55:02 +11:00
time.h	powerpc: Remove FW_FEATURE ISERIES from arch code	2012-03-21 11:16:11 +11:00
timex.h
tlb.h
tlbflush.h
topology.h
trace.h
tsi108_irq.h
tsi108_pci.h
tsi108.h
types.h	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
uaccess.h
ucc_fast.h
ucc_slow.h
ucc.h
ucontext.h
udbg.h	powerpc: Random little legacy iSeries removal tidy ups	2012-03-28 11:33:23 +11:00
uic.h
unaligned.h
uninorth.h
unistd.h
user.h
vdso_datapage.h
vdso.h
vga.h
vio.h	powerpc+sparc/vio: Modernize driver registration	2012-03-28 11:33:24 +11:00
wsp.h
xics.h	irq_domain/powerpc: Use common irq_domain structure instead of irq_host	2012-02-14 14:06:50 -07:00
xilinx_intc.h
xilinx_pci.h
xmon.h
xor.h