alistair23-linux/arch/parisc/include/asm
Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core
Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-11-01 08:24:41 +01:00
..
agp.h
asm-offsets.h
asmregs.h
assembly.h parisc: make interrupt and interruption stack allocation reentrant 2013-05-24 22:35:36 +02:00
atomic.h parisc: implement atomic64_dec_if_positive() 2013-05-06 23:10:04 +02:00
barrier.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
bitops.h
bug.h [PARISC] fix missing TAINT_WARN problem 2012-06-05 14:10:17 +09:00
bugs.h
cache.h
cacheflush.h parisc: Change kunmap macro to static inline function 2013-04-25 22:36:31 +02:00
checksum.h
cmpxchg.h parisc: fix missing cmpxchg file error from system.h split 2012-04-02 14:41:26 -07:00
compat.h parisc: convert msgrcv and msgsnd syscalls to use compat layer 2013-02-20 22:56:50 +01:00
compat_ucontext.h
current.h
delay.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
dma-mapping.h parisc: Provide default implementation for dma_{alloc, free}_attrs 2013-05-06 22:29:09 +02:00
dma.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
eisa_bus.h
eisa_eeprom.h
elf.h parisc: fix personality on 32bit kernel 2013-02-20 22:55:26 +01:00
fb.h
fixmap.h
floppy.h parisc: remove IRQF_DISABLED 2013-02-20 22:50:26 +01:00
ftrace.h
futex.h
grfioctl.h
hardirq.h parisc: fix irq stack on UP and SMP 2013-05-24 23:29:01 +02:00
hardware.h parisc: drop include of asm/pdc.h from asm/hardware.h 2012-05-10 15:12:08 -07:00
ide.h
io.h
irq.h
irqflags.h
kbdleds.h keyboard: Use BIOS Keyboard variable to set Numlock 2012-05-08 14:19:41 -07:00
Kbuild sched, arch: Create asm/preempt.h 2013-09-25 14:07:50 +02:00
kmap_types.h
ldcw.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
led.h
linkage.h
machdep.h
mc146818rtc.h
mckinley.h
mmu.h
mmu_context.h
mmzone.h parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50 (part 2) 2013-06-18 20:20:21 +02:00
module.h Make most arch asm/module.h files use asm-generic/module.h 2012-09-28 14:31:03 +09:30
page.h parisc: fixes and cleanups in page cache flushing (1/4) 2013-02-20 22:49:19 +01:00
parisc-device.h parisc: Fix interrupt routing for C8000 serial ports 2013-07-31 23:42:32 +02:00
parport.h ARCH: drivers remove __dev* attributes. 2013-01-03 15:57:13 -08:00
pci.h parisc: provide pci_mmap_page_range() for parisc 2013-06-18 20:29:08 +02:00
pdc.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
pdc_chassis.h
pdcpat.h
perf.h
perf_event.h
pgalloc.h
pgtable.h consolidate io_remap_pfn_range definitions 2013-06-29 12:46:35 +04:00
prefetch.h [PARISC] fix panic on prefetch(NULL) on PA7300LC 2012-05-16 13:15:21 +01:00
processor.h parisc: fix irq stack on UP and SMP 2013-05-24 23:29:01 +02:00
psw.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
ptrace.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
ropes.h
rt_sigframe.h
rtc.h
runway.h
scatterlist.h
sections.h
serial.h
shmparam.h
signal.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2013-02-23 18:50:11 -08:00
smp.h [PARISC] Fix parisc compile failure after smp: Add task_struct argument to __cpu_up() 2012-05-25 12:35:45 +01:00
special_insns.h parisc: optimize mtsp(0,sr) inline assembly 2013-07-09 22:09:21 +02:00
spinlock.h parisc: add missing includes in asm/spinlock.h 2012-05-10 15:12:08 -07:00
spinlock_types.h
string.h
superio.h
switch_to.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
syscall.h
termios.h UAPI: (Scripted) Disintegrate arch/parisc/include/asm 2012-10-16 21:28:05 +01:00
thread_info.h parisc: add kernel stack overflow check 2013-05-07 21:34:07 +02:00
timex.h Disintegrate asm/system.h for PA-RISC 2012-03-28 18:30:02 +01:00
tlb.h
tlbflush.h parisc: Ensure volatile space register %sr1 is not clobbered 2013-07-09 22:09:22 +02:00
traps.h parisc: mark parisc_terminate() noreturn and cold. 2013-10-13 17:44:49 +02:00
uaccess.h parisc: uaccess: fix compiler warnings caused by __put_user casting 2013-04-25 22:36:42 +02:00
ucontext.h
unaligned.h
unistd.h consolidate cond_syscall and SYSCALL_ALIAS declarations 2013-03-03 22:55:19 -05:00
unwind.h