mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
61b85bf6060bfd205c218f5aeb71c19a24abb0cd
linux/arch/arm/include/asm
History
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
hardware
Merge branch 'misc' into devel
2011-03-16 23:35:25 +00:00
mach
Merge branch 'misc' into devel
2011-03-16 23:35:25 +00:00
a.out-core.h
ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
2011-03-10 15:16:29 +00:00
a.out.h
headers_check fix: arm, a.out.h
2009-02-01 11:01:22 +05:30
asm-offsets.h
kbuild: move asm-offsets.h to include/generated
2009-12-12 13:08:14 +01:00
assembler.h
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
atomic.h
ARM: 6212/1: atomic ops: add memory constraints to inline asm
2010-07-09 11:29:35 +01:00
auxvec.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
bitops.h
ARM: bitops: switch set/clear/change bitops to use ldrex/strex
2011-02-02 21:23:25 +00:00
bitsperlong.h
asm-generic: introduce asm/bitsperlong.h
2009-06-11 21:02:14 +02:00
bug.h
[ARM] 5211/2: fix a couple warnings from BUG() usage
2008-09-01 12:06:27 +01:00
bugs.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
byteorder.h
byteorder: make swab.h include asm/swab.h like a regular header
2009-01-14 19:56:50 -08:00
cache.h
ARM: implement support for read-mostly sections
2010-12-05 08:39:36 +00:00
cacheflush.h
Merge branch 'v6v7' into devel
2011-03-16 23:35:26 +00:00
cachetype.h
ARM: 6385/1: setup: detect aliasing I-cache when D-cache is non-aliasing
2010-10-04 20:57:09 +01:00
checksum.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
clkdev.h
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
cpu.h
ARM: 5872/1: ARM: include needed linux/cpu.h in asm/cpu.h
2010-01-10 13:03:52 +00:00
cputime.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
cputype.h
ARM: fix some sparse errors in generic ARM code
2011-02-23 17:24:12 +00:00
current.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
delay.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
device.h
Driver Core: Add platform device arch data V3
2009-07-22 00:28:38 +02:00
div64.h
[ARM] 5320/1: fix assembly constraints in implementation of do_div()
2008-10-23 12:53:32 +01:00
dma-mapping.h
ARM: DMA: add support for DMA debugging
2011-01-06 22:31:11 +00:00
dma.h
ARM: 5870/1: arch/arm: Fix build failure for defconfigs without CONFIG_ISA_DMA_API set
2010-01-10 00:08:03 +00:00
domain.h
ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs
2010-11-04 15:44:31 +00:00
ecard.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
elf.h
ARM: 6486/1: provide zero vmcore_elf64_check_arch()
2010-11-30 13:40:01 +00:00
emergency-restart.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
entry-macro-multi.S
Merge branch 'smp' into misc
2011-01-06 22:32:03 +00:00
entry-macro-vic2.S
ARM: Add common entry code for system with two VICs
2010-01-15 17:10:14 +09:00
errno.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
fb.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
fcntl.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
fiq.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
fixmap.h
[ARM] fixmap support
2009-03-15 21:01:20 -04:00
flat.h
flat: fix data sections alignment
2009-05-29 08:40:02 -07:00
floppy.h
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
fncpy.h
ARM: 6640/1: Thumb-2: Symbol manipulation macros for function body copying
2011-01-27 11:48:58 +00:00
fpstate.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
ftrace.h
ARM: 6319/1: ftrace: add Thumb-2 support to dynamic ftrace
2010-09-02 15:28:43 +01:00
futex.h
arm: Remove bogus comment in futex_atomic_cmpxchg_inatomic()
2011-03-14 21:10:26 +01:00
glue-cache.h
Merge branch 'v6v7' into devel
2011-03-16 23:35:26 +00:00
glue-df.h
ARM: move cache/processor/fault glue to separate include files
2011-02-12 11:52:21 +00:00
glue-pf.h
ARM: move cache/processor/fault glue to separate include files
2011-02-12 11:52:21 +00:00
glue-proc.h
Merge branch 'v6v7' into devel
2011-03-16 23:35:26 +00:00
glue.h
ARM: move cache/processor/fault glue to separate include files
2011-02-12 11:52:21 +00:00
gpio.h
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
hardirq.h
ARM: SMP: collect IPI and local timer IRQs for /proc/stat
2010-12-20 15:08:01 +00:00
highmem.h
ARM: 6639/1: allow highmem on SMP platforms without h/w TLB ops broadcast
2011-02-23 17:24:17 +00:00
hw_breakpoint.h
ARM: hw_breakpoint: unify single-stepping code for watchpoints and breakpoints
2010-12-06 11:55:57 +00:00
hw_irq.h
arm: Use ARCH_IRQ_INIT_FLAGS
2010-10-16 22:57:38 +02:00
hwcap.h
ARM: 6207/1: Replace CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6
2010-07-09 14:41:35 +01:00
ide.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
io.h
ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+
2011-01-31 10:53:42 +00:00
ioctl.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
ioctls.h
ioctl: Use asm-generic/ioctls.h on arm (enables termiox)
2010-10-22 10:19:59 -07:00
ipcbuf.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
irq_regs.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
irq.h
ARM: 6197/2: preliminary support for sparse IRQ
2010-07-09 14:41:33 +01:00
irqflags.h
Fix IRQ flag handling naming
2010-10-07 14:08:55 +01:00
Kbuild
archs: replace unifdef-y with header-y
2010-08-14 22:26:51 +02:00
kdebug.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
kexec.h
[ARM] add machine-specific hook to machine_kexec
2011-03-03 16:26:55 -05:00
kgdb.h
kgdb,arm: fix register dump
2010-10-29 13:14:40 -05:00
kmap_types.h
kdb: core for kgdb back end (2 of 2)
2010-05-20 21:04:21 -05:00
kprobes.h
[ARM] 5206/1: remove kprobe_trap_handler() hack
2008-09-01 12:06:26 +01:00
leds.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
limits.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
linkage.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
local64.h
arch: Implement local64_t
2010-06-09 11:12:36 +02:00
local.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
localtimer.h
ARM: localtimer: clean up local timer on hot unplug
2010-12-20 15:09:16 +00:00
locks.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
mach-types.h
arm: move mach-types to include/generated
2009-12-12 13:08:14 +01:00
mc146818rtc.h
[ARM] Convert asm/io.h to linux/io.h
2008-09-06 12:10:45 +01:00
memblock.h
ARM: fix memblock breakage
2010-10-27 21:41:39 +01:00
memory.h
ARM: 6675/1: use phys_addr_t instead of unsigned long in conversion code
2011-02-17 23:27:34 +00:00
mman.h
arm: add arch_mmap_check(), get rid of sys_arm_mremap()
2009-12-11 06:34:09 -05:00
mmu_context.h
ARM: add a vma entry for the user accessible vector page
2010-10-01 22:35:19 -04:00
mmu.h
ARM: 6490/1: MM: bugfix: initialize spinlock for init_mm.context
2010-11-23 22:46:12 +00:00
module.h
ARM: 6766/1: Thumb-2: Reflect ARM/Thumb-2 configuration in module vermagic
2011-02-26 13:36:06 +00:00
msgbuf.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
mtd-xip.h
[ARM] move asm/xip.h's mach/hardware.h include to mach/xip.h
2008-12-14 13:22:51 +00:00
mutex.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
nwflash.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
outercache.h
ARM: 6795/1: l2x0: Errata fix for flush by Way operation can cause data corrupti
2011-03-09 00:18:34 +00:00
page-nommu.h
nommu: Remove the memory_start/end variables from ARM page-nommu.h
2009-07-24 12:35:01 +01:00
page.h
ARM: pgtable: introduce pteval_t to represent a pte value
2010-11-26 20:45:47 +00:00
param.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
parport.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
pci.h
ARM: 6058/1: Add support for PCI domains
2010-04-22 21:38:11 +01:00
percpu.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
perf_event.h
irq_work: Add generic hardirq context callbacks
2010-10-18 19:58:50 +02:00
pgalloc.h
ARM: 6757/1: fix tlb.h induced linux/swap.h build failure
2011-02-23 16:19:21 +00:00
pgtable-hwdef.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
pgtable-nommu.h
ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds
2010-03-13 10:48:22 +00:00
pgtable.h
ARM: pgtable: provide RDONLY page table bit rather than WRITE bit
2010-12-22 11:05:35 +00:00
pmu.h
ARM: perf_event: allow platform-specific interrupt handler
2011-02-17 13:55:45 +01:00
poll.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
posix_types.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
proc-fns.h
ARM: pm: add generic CPU suspend/resume support
2011-02-22 17:11:23 +00:00
processor.h
Merge branch 'misc' into devel
2011-03-16 23:35:25 +00:00
procinfo.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
ptrace.h
ARM: 6668/1: ptrace: remove single-step emulation code
2011-02-23 17:24:22 +00:00
resource.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
scatterlist.h
asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h
2010-05-27 09:12:54 -07:00
sched_clock.h
ARM: sched_clock: allow init_sched_clock() to be called early
2011-01-11 16:23:04 +00:00
seccomp.h
ARM: SECCOMP support
2010-10-01 22:32:18 -04:00
sections.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
segment.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
sembuf.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
serial.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
setup.h
ARM: lh7a40x: remove unmaintained platform support
2011-01-24 19:05:19 +00:00
shmbuf.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
shmparam.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
sigcontext.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
siginfo.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
signal.h
asm-generic: rename termios.h, signal.h and mman.h
2009-06-11 21:01:52 +02:00
sizes.h
ARM: 6536/1: Add missing SZ_{32,64,128}
2010-12-24 09:37:58 +00:00
smp_plat.h
Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel
2010-10-18 22:34:25 +01:00
smp_scu.h
ARM: pm: add function to set WFI low-power mode for SMP CPUs
2011-02-11 12:29:18 +00:00
smp_twd.h
ARM: localtimer: clean up local timer on hot unplug
2010-12-20 15:09:16 +00:00
smp.h
ARM: SMP: consolidate the common parts of smp_prepare_cpus()
2010-12-20 15:09:08 +00:00
socket.h
net: Generalize socket rx gap / receive queue overflow cmsg
2009-10-12 13:26:31 -07:00
sockios.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
sparsemem.h
[ARM] mm: enable sparsemem on clps7500 and RiscPC
2008-10-01 17:24:04 +01:00
spinlock_types.h
locking: Convert raw_rwlock to arch_rwlock
2009-12-14 23:55:32 +01:00
spinlock.h
ARM: 6655/1: Correct WFE() in asm/spinlock.h for Thumb-2
2011-02-10 15:30:51 +00:00
stackprotector.h
ARM: initial stack protector (-fstack-protector) support
2010-06-14 21:31:00 -04:00
stacktrace.h
[ARM] 5382/1: unwind: Reorganise the stacktrace support
2009-02-12 13:21:17 +00:00
stat.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
statfs.h
ARM: Use <asm-generic/statfs.h>
2008-09-04 09:46:11 +01:00
string.h
[ARM] remove memzero()
2008-11-27 12:37:59 +00:00
swab.h
ARM: 5772/1: Use REV and REV16 for byte swapping on ARMv6+
2009-10-25 15:59:53 +00:00
system.h
ARM: v6k: select cmpxchg code sequences according to V6 variants
2011-02-02 21:23:28 +00:00
tcm.h
ARM: 5580/2: ARM TCM (Tightly-Coupled Memory) support v3
2009-09-15 22:11:05 +01:00
termbits.h
tty: Add EXTPROC support for LINEMODE
2010-08-10 13:47:39 -07:00
termios.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
therm.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
thread_info.h
ARM: SECCOMP support
2010-10-01 22:32:18 -04:00
thread_notify.h
ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
2009-12-18 14:53:41 +00:00
timex.h
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
tlb.h
ARM: tlb: move noMMU tlb_flush() to asm/tlb.h
2011-02-21 19:29:28 +00:00
tlbflush.h
ARM: tlb: move noMMU tlb_flush() to asm/tlb.h
2011-02-21 19:29:28 +00:00
tls.h
ARM: v6k: select TLS register code according to V6 variants
2011-02-02 21:23:29 +00:00
topology.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
traps.h
ARM: 6668/1: ptrace: remove single-step emulation code
2011-02-23 17:24:22 +00:00
types.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
uaccess.h
ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs
2010-11-04 15:44:31 +00:00
ucontext.h
ARM: 6051/1: VFP: preserve the HW context when calling signal handlers
2010-04-14 11:11:30 +01:00
unaligned.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
unified.h
Fix "W" macro in arch/arm/include/asm/unified.h
2009-09-18 23:30:11 +01:00
unistd.h
ARM: 6343/1: wire up fanotify and prlimit64 syscalls on ARM
2010-09-01 10:06:08 +01:00
unwind.h
[ARM] 5383/2: unwind: Add core support for ARM stack unwinding
2009-02-19 11:26:24 +00:00
user.h
ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
2011-03-10 15:16:29 +00:00
vfp.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00
vfpmacros.h
ARM: 6203/1: Make VFPv3 usable on ARMv6
2010-07-09 14:41:34 +01:00
vga.h
[ARM] Convert asm/io.h to linux/io.h
2008-09-06 12:10:45 +01:00
xor.h
[ARM] move include/asm-arm to arch/arm/include/asm
2008-08-02 21:32:35 +01:00