openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/frv/include/asm
History
Linus Torvalds 27c1ee3f92 Merge branch 'akpm' (Andrew's patch-bomb) 
Merge Andrew's first set of patches:
 "Non-MM patches:

   - lots of misc bits

   - tree-wide have_clk() cleanups

   - quite a lot of printk tweaks.  I draw your attention to "printk:
     convert the format for KERN_<LEVEL> to a 2 byte pattern" which
     looks a bit scary.  But afaict it's solid.

   - backlight updates

   - lib/ feature work (notably the addition and use of memweight())

   - checkpatch updates

   - rtc updates

   - nilfs updates

   - fatfs updates (partial, still waiting for acks)

   - kdump, proc, fork, IPC, sysctl, taskstats, pps, etc

   - new fault-injection feature work"

* Merge emailed patches from Andrew Morton <akpm@linux-foundation.org>: (128 commits)
  drivers/misc/lkdtm.c: fix missing allocation failure check
  lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table()
  fault-injection: add tool to run command with failslab or fail_page_alloc
  fault-injection: add selftests for cpu and memory hotplug
  powerpc: pSeries reconfig notifier error injection module
  memory: memory notifier error injection module
  PM: PM notifier error injection module
  cpu: rewrite cpu-notifier-error-inject module
  fault-injection: notifier error injection
  c/r: fcntl: add F_GETOWNER_UIDS option
  resource: make sure requested range is included in the root range
  include/linux/aio.h: cpp->C conversions
  fs: cachefiles: add support for large files in filesystem caching
  pps: return PTR_ERR on error in device_create
  taskstats: check nla_reserve() return
  sysctl: suppress kmemleak messages
  ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
  ipc: compat: use signed size_t types for msgsnd and msgrcv
  ipc: allow compat IPC version field parsing if !ARCH_WANT_OLD_COMPAT_IPC
  ipc: add COMPAT_SHMLBA support
  ...
 		2012-07-30 17:25:34 -07:00
..
Kbuild archs: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h Disintegrate asm/system.h for FRV 2012-03-28 18:30:02 +01:00
auxvec.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
ax88796.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
barrier.h Disintegrate asm/system.h for FRV 2012-03-28 18:30:02 +01:00
bitops.h asm-generic: add another generic ext2 atomic bitops 2011-07-26 16:49:46 -07:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h Disintegrate asm/system.h for FRV 2012-03-28 18:30:02 +01:00
bugs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
busctl-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
byteorder.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
cache.h FRV: ARCH_KMALLOC_MINALIGN was already defined 2010-05-28 10:17:21 -07:00
cacheflush.h block: add helpers to run flush_dcache_page() against a bio and a request's pages 2009-11-26 09:16:19 +01:00
checksum.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
cmpxchg.h Disintegrate asm/system.h for FRV 2012-03-28 18:30:02 +01:00
cpu-irqs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
cputime.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
current.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
delay.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
device.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
div64.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
dm9000.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
errno.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
exec.h Disintegrate asm/system.h for FRV 2012-03-28 18:30:02 +01:00
fb.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
fcntl.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
fpu.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
ftrace.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
futex.h futex: Sanitize futex ops argument types 2011-03-11 12:23:31 +01:00
gdb-stub.h frv: extend gdbstub to support more features of gdb 2010-05-25 08:07:02 -07:00
gpio-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
hardirq.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
highmem.h frv: remove the second parameter of kmap_atomic_primary() 2012-07-23 14:11:22 +08:00
hw_irq.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
io.h frv: switch to GENERIC_PCI_IOMAP 2011-12-04 16:00:12 +02:00
ioctl.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
ioctls.h ioctl: Use asm-generic/ioctls.h on frv (enables termiox) 2010-10-22 10:20:00 -07:00
ipcbuf.h consolidate a bunch of ipcbuf.h instances 2012-01-03 22:55:18 -05:00
irc-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
irq.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
irq_regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
irqflags.h Fix IRQ flag handling naming 2010-10-07 14:08:55 +01:00
kdebug.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
kmap_types.h frv: remove km_type definitions 2012-07-24 15:27:29 +08:00
kvm_para.h kvmclock: Add functions to check if the host has stopped the vm 2012-04-08 12:48:59 +03:00
linkage.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
local.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
math-emu.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mb-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mb86943a.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mb93091-fpga-irqs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mb93093-fpga-irqs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mb93493-irqs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mb93493-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mc146818rtc.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mem-layout.h dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN 2010-08-11 08:59:21 -07:00
mman.h mm: remove duplicate asm/mman.h files 2009-09-22 07:17:42 -07:00
mmu.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mmu_context.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
module.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
msgbuf.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
mutex.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
page.h FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stack 2010-01-06 18:16:02 -08:00
param.h UAPI: Make FRV use asm-generic/param.h 2011-12-12 13:56:04 +00:00
pci.h Fix common misspellings 2011-03-31 11:26:23 -03:00
percpu.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
perf_event.h perf, arch: Rework perf_event_index() 2011-12-21 11:01:07 +01:00
pgalloc.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
pgtable.h mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
poll.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
posix_types.h bury __kernel_nlink_t, make internal nlink_t consistent 2012-05-30 21:04:50 -04:00
processor.h Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2012-05-23 17:12:06 -07:00
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
registers.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
resource.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
sections.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
segment.h frv: fix kernel/user segment handling in NOMMU mode 2010-04-07 08:38:05 -07:00
sembuf.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
serial-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
serial.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
setup.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
shmbuf.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
shmparam.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
sigcontext.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
siginfo.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
signal.h FRV: Fix interaction with new generic header stuff 2009-06-13 13:17:28 -07:00
smp.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
socket.h net: Add framework to allow sending packets with customized CRC. 2012-02-24 01:37:35 -08:00
sockios.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
spinlock.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
spr-regs.h Fix common misspellings 2011-03-31 11:26:23 -03:00
stat.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
statfs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
string.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
swab.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
switch_to.h Disintegrate asm/system.h for FRV 2012-03-28 18:30:02 +01:00
syscall.h FRV: Implement new-style ptrace 2009-06-11 09:01:26 -07:00
termbits.h tty: Add EXTPROC support for LINEMODE 2010-08-10 13:47:39 -07:00
termios.h asm-generic: rename termios.h, signal.h and mman.h 2009-06-11 21:01:52 +02:00
thread_info.h FRV: Shrink TIF_WORK_MASK [ver #2] 2012-06-01 12:59:37 -04:00
timer-regs.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
timex.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
tlb.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
tlbflush.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
topology.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
types.h consolidate umode_t declarations 2012-01-03 22:55:17 -05:00
uaccess.h frv: fix kernel/user segment handling in NOMMU mode 2010-04-07 08:38:05 -07:00
ucontext.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
unaligned.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
unistd.h ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION 2012-07-30 17:25:21 -07:00
user.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
vga.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00
virtconvert.h Fix common misspellings 2011-03-31 11:26:23 -03:00
xor.h FRV: Move to arch/frv/include/asm/ 2009-04-10 01:48:06 +01:00