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
..
agp.h
apb.h
apc.h
asi.h
asm-offsets.h
asm.h
asmmacro.h
atomic.h
atomic_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
atomic_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
auxio.h
auxio_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
auxio_64.h
auxvec.h
backoff.h
barrier.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
barrier_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
barrier_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
bbc.h
bitext.h
bitops.h
bitops_32.h
bitops_64.h	sparc: Use popc when possible for ffs/__ffs/ffz.	2011-08-02 21:28:53 -07:00
bitsperlong.h
btext.h
btfixup.h
bug.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
bugs.h
byteorder.h
cache.h
cacheflush.h
cacheflush_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
cacheflush_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
chafsr.h
checksum.h
checksum_32.h
checksum_64.h
chmctrl.h
clock.h
cmpxchg.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
cmpxchg_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
cmpxchg_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
cmt.h
compat.h	compat: sync compat_stats with statfs.	2011-10-28 14:58:53 +02:00
compat_signal.h
contregs.h
cpu_type.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
cpudata.h
cpudata_32.h
cpudata_64.h
cputime.h
current.h
cypress.h
dcr.h
dcu.h
delay.h
delay_32.h
delay_64.h
device.h
display7seg.h
dma-mapping.h
dma.h
ebus_dma.h
ecc.h
eeprom.h
elf.h
elf_32.h
elf_64.h	sparc: Sanitize cpu feature detection and reporting.	2011-07-28 23:31:26 -07:00
emergency-restart.h
envctrl.h
errno.h
estate.h
exec.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
fb.h
fbio.h
fcntl.h
fhc.h
fixmap.h
floppy.h
floppy_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
floppy_64.h	sparc: Remove unnecessary semicolons	2011-06-07 16:06:34 -07:00
fpumacro.h
ftrace.h
futex.h
futex_32.h
futex_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
gpio.h
hardirq.h
hardirq_32.h
hardirq_64.h
head.h
head_32.h
head_64.h
highmem.h	highmem: kill all __kmap_atomic()	2012-03-20 21:48:30 +08:00
hugetlb.h
hvtramp.h
hw_irq.h
hypervisor.h	sparc: Set reboot-cmd using reboot data hypervisor call if available.	2011-08-02 21:28:52 -07:00
ide.h
idprom.h
intr_queue.h
io-unit.h
io.h
io_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
io_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
ioctl.h
ioctls.h
iommu.h
iommu_32.h
iommu_64.h
ipcbuf.h
irq.h
irq_32.h
irq_64.h	nmi watchdog: do not use cpp symbol in Kconfig	2012-03-23 16:58:31 -07:00
irqflags.h
irqflags_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
irqflags_64.h	sparc/irqs: Do not trace arch_local_{*,irq_*} functions	2011-07-06 08:00:29 -07:00
jsflash.h
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	sparc: use kbuild-generic support for true asm-generic header files	2011-08-04 01:35:12 -07:00
kdebug.h
kdebug_32.h
kdebug_64.h
kgdb.h
kmap_types.h
kprobes.h
ldc.h
leon.h	sparc32,leon: add GRPCI2 PCI Host driver	2011-06-02 14:32:38 -07:00
leon_amba.h
leon_pci.h	PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.	2011-07-22 08:26:06 -07:00
linkage.h
lsu.h
machines.h
mbus.h
mc146818rtc.h
mc146818rtc_32.h
mc146818rtc_64.h
mdesc.h
memctrl.h
memreg.h
mman.h
mmu.h
mmu_32.h
mmu_64.h
mmu_context.h
mmu_context_32.h
mmu_context_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
mmzone.h	Fix node_start/end_pfn() definition for mm/page_cgroup.c	2011-06-27 14:13:09 -07:00
module.h
mpmbox.h
msgbuf.h
msi.h
mutex.h
mxcc.h
nmi.h
ns87303.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
obio.h
openprom.h
openpromio.h
oplib.h
oplib_32.h
oplib_64.h
page.h
page_32.h	sparc32: fix PAGE_SIZE definition	2011-12-29 14:58:31 -08:00
page_64.h
param.h
parport.h
pbm.h
pci.h
pci_32.h	PCI: collapse pcibios_resource_to_bus	2012-02-23 20:19:04 -07:00
pci_64.h	PCI: collapse pcibios_resource_to_bus	2012-02-23 20:19:04 -07:00
pcic.h	sparc32: added CONFIG_PCIC_PCI Kconfig setting	2011-06-02 14:32:37 -07:00
pcr.h
percpu.h
percpu_32.h
percpu_64.h
perf_event.h
perfctr.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
pgalloc.h
pgalloc_32.h
pgalloc_64.h	sparc64: use RCU page table freeing	2011-07-25 20:57:10 -07:00
pgtable.h
pgtable_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
pgtable_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
pgtsrmmu.h	sparc32,leon: SRMMU MMU Table probe fix	2011-10-07 12:08:01 -07:00
pgtsun4c.h
pil.h
poll.h
posix_types.h	sparc: Use generic posix_types.h	2012-02-14 12:01:30 -08:00
processor.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
processor_32.h
processor_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
prom.h	irq_domain: Centralize definition of irq_dispose_mapping()	2012-02-26 16:48:06 -07:00
psr.h
psrcompat.h
pstate.h
ptrace.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
resource.h
ross.h
rwsem.h
sbi.h
scatterlist.h
scratchpad.h
seccomp.h
sections.h
sembuf.h
serial.h
setup.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
sfafsr.h
sfp-machine.h
sfp-machine_32.h
sfp-machine_64.h
shmbuf.h
shmparam.h
shmparam_32.h
shmparam_64.h
sigcontext.h	sparc: Allow handling signals when stack is corrupted.	2011-08-20 17:14:54 -07:00
siginfo.h	UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h	2011-12-12 13:54:35 +00:00
signal.h	sparc: make SA_NOMASK a synonym of SA_NODEFER	2012-01-10 16:30:54 -08:00
smp.h
smp_32.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
smp_64.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
smpprim.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.h
spinlock_32.h	sparc32: unbreak arch_write_unlock()	2011-08-15 14:35:19 -07:00
spinlock_64.h	sparc64: remove unnecessary macros from spinlock_64.h	2011-08-15 14:35:18 -07:00
spinlock_types.h
spitfire.h	sparc64: Future proof Niagara cpu detection.	2011-09-16 14:21:33 -07:00
stacktrace.h
starfire.h
stat.h
statfs.h
string.h
string_32.h
string_64.h
sunbpp.h
swab.h
swift.h
switch_to.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
switch_to_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
switch_to_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
syscall.h
syscalls.h
sysen.h
termbits.h
termios.h	sparc: remove several unnecessary module.h include instances	2011-10-31 19:30:54 -04:00
thread_info.h
thread_info_32.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next	2012-01-09 14:47:06 -08:00
thread_info_64.h	freezer: remove now unused TIF_FREEZE	2011-11-21 12:32:25 -08:00
timer.h
timer_32.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
timer_64.h
timex.h
timex_32.h
timex_64.h
tlb.h
tlb_32.h
tlb_64.h	sparc: mmu_gather rework	2011-05-25 08:39:13 -07:00
tlbflush.h
tlbflush_32.h
tlbflush_64.h	sparc: mmu_gather rework	2011-05-25 08:39:13 -07:00
topology.h
topology_32.h
topology_64.h
trap_block.h
traps.h
tsb.h	sparc: Access kernel TSB using physical addressing when possible.	2011-08-05 00:53:57 -07:00
tsunami.h
ttable.h
turbosparc.h
types.h	consolidate umode_t declarations	2012-01-03 22:55:17 -05:00
uaccess.h
uaccess_32.h
uaccess_64.h	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
uctx.h
unaligned.h
unistd.h	sparc: Hook up process_vm_{readv,writev} syscalls.	2011-11-01 00:51:30 -07:00
upa.h
user.h
utrap.h
vac-ops.h
vaddrs.h
vga.h	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
viking.h
vio.h	powerpc+sparc/vio: Modernize driver registration	2012-03-28 11:33:24 +11:00
visasm.h
watchdog.h
winmacro.h
xor.h
xor_32.h
xor_64.h	sparc64: Future proof Niagara cpu detection.	2011-09-16 14:21:33 -07:00