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
..
dec
emma
fw
ip32	net: meth: Add set_rx_mode hook to fix ICMPv6 neighbor discovery	2011-12-27 13:17:34 -05:00
lasat	doc: fix broken references	2011-09-27 18:08:04 +02:00
mach-ar7
mach-ath79	MIPS: ath79: Add AR933x specific WMAC setup code	2011-12-07 22:02:48 +00:00
mach-au1x00	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mach-bcm47xx	MIPS: BCM47XX: move and extend sprom parsing	2012-03-05 15:20:51 -05:00
mach-bcm63xx	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-01-14 13:05:21 -08:00
mach-cavium-octeon	MIPS: Octeon: Enable C0_UserLocal probing.	2011-09-24 01:44:41 +02:00
mach-cobalt
mach-db1x00	MIPS: Alchemy: remove unused board headers	2011-12-08 10:42:15 +00:00
mach-dec
mach-emma2rh
mach-generic	MIPS: irq: Remove IRQF_DISABLED	2011-12-07 22:03:45 +00:00
mach-ip22
mach-ip27	MIPS: Remove pointless return statement from empty void functions.	2011-07-25 17:26:55 +01:00
mach-ip28
mach-ip32
mach-jazz	MIPS: irq: Remove IRQF_DISABLED	2011-12-07 22:03:45 +00:00
mach-jz4740	MIPS: static should be at beginning of declaration	2011-07-11 14:13:46 +02:00
mach-lantiq	MIPS: Lantiq: Add ethernet driver	2011-05-19 09:55:43 +01:00
mach-lasat
mach-loongson	MIPS: Remove pointless return statement from empty void functions.	2011-07-25 17:26:55 +01:00
mach-malta	MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms	2011-07-25 17:26:55 +01:00
mach-mipssim	MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms	2011-07-25 17:26:55 +01:00
mach-netlogic	MIPS: Netlogic: XLP CPU support.	2011-12-07 22:04:55 +00:00
mach-pnx833x
mach-pnx8550
mach-powertv	MIPS: Remove unneeded version.h includes from arch/mips/	2011-09-17 02:40:36 +02:00
mach-rc32434
mach-rm
mach-sibyte
mach-tx39xx	MIPS: Move FIXADDR_TOP into spaces.h	2011-07-25 17:26:53 +01:00
mach-tx49xx	MIPS: Move FIXADDR_TOP into spaces.h	2011-07-25 17:26:53 +01:00
mach-vr41xx
mach-wrppmc
mach-yosemite
mips-boards
netlogic	MIPS: Netlogic: Merge some of XLR/XLP wakup code	2011-12-07 22:04:56 +00:00
octeon	MIPS: Octeon: Update DMA mapping operations for OCTEON II processors.	2011-12-07 22:03:29 +00:00
pci
pmc-sierra/msp71xx
sgi
sibyte
sn
txx9	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
vr41xx
xtalk
abi.h
addrspace.h
amon.h
arch_hweight.h
asm-offsets.h
asm.h
asmmacro-32.h
asmmacro-64.h
asmmacro.h
atomic.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
auxvec.h
barrier.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
bcache.h
bitops.h
bitsperlong.h
bmips.h	MIPS: BMIPS: Introduce bmips.h	2011-12-07 22:03:18 +00:00
bootinfo.h	MIPS: Handle initmem in systems with kernel not in add_memory_region() mem	2011-12-07 22:03:45 +00:00
branch.h	MIPS Kprobes: Refactor branch emulation	2011-12-07 22:04:03 +00:00
break.h
bug.h
bugs.h
byteorder.h
cache.h
cachectl.h
cacheflush.h	MIPS: cache: Provide cache flush operations for XFS	2011-10-20 15:00:18 +01:00
cacheops.h
cevt-r4k.h
checksum.h
clock.h
cmp.h
cmpxchg.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
compat-signal.h
compat.h	compat: sync compat_stats with statfs.	2011-10-28 14:58:53 +02:00
compiler.h
cop2.h
cpu-features.h
cpu-info.h
cpu.h	Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next	2012-01-11 15:42:31 +01:00
cputime.h
current.h
debug.h
delay.h
device.h
div64.h
dma-mapping.h	MIPS: Kludge IP27 build for 2.6.39.	2011-05-18 14:18:27 +01:00
dma.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
ds1287.h
dsp.h
edac.h
elf.h
emergency-restart.h
errno.h
exec.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
fb.h
fcntl.h
fixmap.h	MIPS: Move FIXADDR_TOP into spaces.h	2011-07-25 17:26:53 +01:00
floppy.h	treewide: fix potentially dangerous trailing ';' in #defined values/expressions	2011-07-21 14:10:00 +02:00
fpregdef.h
fpu_emulator.h
fpu.h
ftrace.h
futex.h
gcmpregs.h
gic.h
gio_device.h	MIPS: GIO bus support for SGI IP22/28	2011-12-07 22:03:44 +00:00
gpio.h
gt64120.h	MIPS: GT64120: Remove useless inclusion of clocksource.h.	2011-07-20 23:12:10 +01:00
hardirq.h
hazards.h	MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS	2011-12-07 22:03:17 +00:00
highmem.h	highmem: kill all __kmap_atomic()	2012-03-20 21:48:30 +08:00
hugetlb.h	MIPS: Hugetlb: Keep TLB cache hot while flushing	2011-12-07 22:03:45 +00:00
hw_irq.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
i8259.h
ide.h
inst.h
io.h	Revert "MIPS: LD/SD o32 macro GAS fix update"	2011-10-20 15:00:19 +01:00
ioctl.h
ioctls.h
ipcbuf.h	consolidate a bunch of ipcbuf.h instances	2012-01-03 22:55:18 -05:00
irq_cpu.h
irq_gt641xx.h
irq_regs.h
irq.h	irq_domain/mips: Allow irq_domain on MIPS	2012-02-24 09:47:23 -07:00
irqflags.h
isadep.h
jazz.h
jazzdma.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	UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines	2011-12-12 13:52:27 +00:00
kdebug.h
kexec.h
kgdb.h
kmap_types.h
kprobes.h	MIPS Kprobes: Support branch instructions probing	2011-12-07 22:04:03 +00:00
kspd.h
linkage.h
local64.h
local.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
m48t37.h
mc146818-time.h
mc146818rtc.h
mips_machine.h
mips_mt.h
mipsmtregs.h
mipsprom.h	MIPS: SNI: Fix conflicting wrapper symbols for headers.	2011-10-20 15:00:18 +01:00
mipsregs.h	MIPS: BMIPS: Add set/clear CP0 macros for BMIPS operations	2011-12-07 22:03:18 +00:00
mman.h	coredump: add VM_NODUMP, MADV_NODUMP, MADV_CLEAR_NODUMP	2012-03-23 16:58:42 -07:00
mmu_context.h
mmu.h
mmzone.h
module.h	Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next	2012-01-11 15:42:31 +01:00
msc01_ic.h
msgbuf.h
mutex.h
nile4.h
paccess.h
page.h	MIPS: Remove temporary kludge from <asm/page.h>	2012-02-20 18:33:18 +01:00
param.h
parport.h
pci.h	PCI: collapse pcibios_resource_to_bus	2012-02-23 20:19:04 -07:00
percpu.h
perf_event.h
pgalloc.h
pgtable-32.h	Merge branch 'next/generic' into mips-for-linux-next	2012-01-11 15:41:47 +01:00
pgtable-64.h
pgtable-bits.h
pgtable.h	MIPS: topdown mmap support	2011-07-25 17:26:51 +01:00
pmon.h
poll.h
posix_types.h	mips: Use generic posix_types.h	2012-02-14 12:01:29 -08:00
prefetch.h
processor.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
prom.h	MIPS: SNI: Fix conflicting wrapper symbols for headers.	2011-10-20 15:00:18 +01:00
ptrace.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit	2012-01-17 16:41:31 -08:00
r4k-timer.h
r4kcache.h
reboot.h
reg.h
regdef.h	MIPS: O32: Provide definition of registers ta0 .. ta3.	2011-10-24 23:34:27 +01:00
resource.h
rm9k-ocd.h
rtlx.h
scatterlist.h
seccomp.h
sections.h
segment.h
sembuf.h
serial.h
setup.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sgialib.h
sgiarcs.h
sgidefs.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sim.h
smp-ops.h	MIPS: ARC: Fix build of firmware library on uniprocessor.	2011-07-20 23:12:11 +01:00
smp.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
smtc_ipi.h
smtc_proc.h
smtc.h	MIPS: SMTC: Fix build.	2011-07-20 23:12:10 +01:00
smvp.h
sni.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
spram.h
stackframe.h	MIPS: Don't clobber CP0_STATUS value for CONFIG_MIPS_MT_SMTC	2011-09-21 17:54:02 +02:00
stacktrace.h	MIPS: Add new unwind_stack variant	2011-06-15 14:35:33 +02:00
stat.h
statfs.h
string.h
suspend.h	PM / Hibernate: Remove arch_prepare_suspend()	2011-05-24 23:35:55 +02:00
swab.h
switch_to.h	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sysmips.h
termbits.h
termios.h
thread_info.h	freezer: remove now unused TIF_FREEZE	2011-11-21 12:32:25 -08:00
time.h
timex.h
titan_dep.h
tlb.h
tlbdebug.h
tlbflush.h
tlbmisc.h	MIPS: Fix Jazz 64-bit build error.	2011-12-07 22:01:45 +00:00
topology.h
traps.h	MIPS: Add board_ebase_setup()	2011-12-07 22:03:18 +00:00
txx9irq.h
txx9pio.h
txx9tmr.h
types.h	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
uaccess.h
uasm.h	MIPS: Add uasm UASM_i_SRL_SAFE macro.	2011-07-26 06:47:36 +01:00
ucontext.h
unaligned.h
unistd.h	MIPS: Hook up process_vm_readv and process_vm_writev system calls.	2011-11-09 00:07:56 +00:00
user.h
vdso.h
vga.h
vpe.h
war.h
watch.h
wbflush.h
xor.h