android_kernel_motorola_sm6225/arch/s390/include/asm
Linus Torvalds 0b981cb94b Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler changes from Ingo Molnar:
 "Continued quest to clean up and enhance the cputime code by Frederic
  Weisbecker, in preparation for future tickless kernel features.

  Other than that, smallish changes."

Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  cputime: Make finegrained irqtime accounting generally available
  cputime: Gather time/stats accounting config options into a single menu
  ia64: Reuse system and user vtime accounting functions on task switch
  ia64: Consolidate user vtime accounting
  vtime: Consolidate system/idle context detection
  cputime: Use a proper subsystem naming for vtime related APIs
  sched: cpu_power: enable ARCH_POWER
  sched/nohz: Clean up select_nohz_load_balancer()
  sched: Fix load avg vs. cpu-hotplug
  sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW
  sched: Fix nohz_idle_balance()
  sched: Remove useless code in yield_to()
  sched: Add time unit suffix to sched sysctl knobs
  sched/debug: Limit sd->*_idx range on sysctl
  sched: Remove AFFINE_WAKEUPS feature flag
  s390: Remove leftover account_tick_vtime() header
  cputime: Consolidate vtime handling on context switch
  sched: Move cputime code to its own file
  cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING
  tile: Remove SD_PREFER_LOCAL leftover
  ...
2012-10-01 10:43:39 -07:00
..
airq.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
appldata.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
auxvec.h
barrier.h s390/barrier: make use of fast-bcr facility 2012-05-16 14:42:45 +02:00
bitops.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
bitsperlong.h
bug.h panic: Allow warnings to set different taint flags 2010-05-19 08:36:48 +01:00
bugs.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
byteorder.h
cache.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
cacheflush.h module: undo module RONX protection correctly. 2011-05-19 16:55:26 +09:30
ccwdev.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ccwgroup.h s390/ccwgroup: remove unused ccwgroup_device member 2012-06-05 13:23:37 +02:00
checksum.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
chpid.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
chsc.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
cio.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
cmb.h
cmpxchg.h s390/cmpxchg: fix sign extension bugs 2012-05-30 09:07:58 +02:00
compat.h compat: fix compile breakage on s390 2012-02-27 07:54:27 -08:00
cpcmd.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
cpu.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
cpu_mf.h [S390] Fix build errors (fallout from system.h disintegration) 2012-03-30 09:41:12 +02:00
cputime.h vtime: Consolidate system/idle context detection 2012-09-25 15:42:37 +02:00
crw.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ctl_reg.h s390/headers: replace __s390x__ with CONFIG_64BIT where possible 2012-05-24 10:10:10 +02:00
current.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
dasd.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
debug.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
delay.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
device.h
diag.h [S390] replace diag10() with diag10_range() function 2011-05-10 17:13:43 +02:00
div64.h
dma.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ebcdic.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
elf.h s390/32: Don't clobber personality flags on exec 2012-08-30 16:28:07 +02:00
emergency-restart.h
errno.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
etr.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
exec.h Disintegrate asm/system.h for S390 2012-03-28 18:30:02 +01:00
extmem.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
facility.h [S390] Fix stfle() lowcore protection problem 2012-04-11 14:28:26 +02:00
fb.h
fcntl.h
fcx.h
ftrace.h ftrace/s390: mcount offset calculation 2011-05-16 15:05:06 -04:00
futex.h s390/headers: remove #ifdef __KERNEL__ from not exported headers 2012-05-24 10:10:05 +02:00
hardirq.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
hugetlb.h s390/hugetlb: use direct TLB flushing for hugetlbfs pages 2012-09-06 10:40:37 +02:00
idals.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
io.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ioctl.h
ioctls.h ioctl: Use asm-generic/ioctls.h on s390 (enables termiox) 2010-10-22 10:20:01 -07:00
ipcbuf.h
ipl.h [S390] kernel: Add z/VM LGR detection 2012-03-11 11:59:29 -04:00
irq.h s390/irq: split irq stats for cpu-measurement alert facilities 2012-05-23 17:06:52 +02:00
irq_regs.h
irqflags.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
isc.h
itcw.h UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter 2011-12-13 09:26:45 +00:00
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 KVM: S390: Export kvm_virtio.h 2010-10-24 10:51:30 +02:00
kdebug.h [S390] cleanup trap handling 2011-12-27 11:27:12 +01:00
kexec.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
kmap_types.h s390/headers: remove #ifdef __KERNEL__ from not exported headers 2012-05-24 10:10:05 +02:00
kprobes.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
kvm.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
kvm_host.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
kvm_para.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
kvm_virtio.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
linkage.h [S390] fix s390 assembler code alignments 2011-07-24 10:48:21 +02:00
local.h
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
lowcore.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
mathemu.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
mman.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
mmu.h [S390] Fix build errors (fallout from system.h disintegration) 2012-03-30 09:41:12 +02:00
mmu_context.h s390/mm: rename user_mode variable to addressing_mode 2012-07-30 11:03:11 +02:00
module.h s390/headers: replace __s390x__ with CONFIG_64BIT where possible 2012-05-24 10:10:10 +02:00
monwriter.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
msgbuf.h
mutex.h [S390] mutex: Introduce arch_mutex_cpu_relax() 2011-01-05 12:47:31 +01:00
nmi.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
os_info.h s390/kernel: Remove OS info init function call and diag 308 for kdump 2012-05-23 17:06:50 +02:00
page.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
param.h [S390] Have param.h simply include <asm-generic/param.h>. 2010-01-04 09:05:58 +01:00
pci.h
percpu.h s390/headers: replace __s390x__ with CONFIG_64BIT where possible 2012-05-24 10:10:10 +02:00
perf_event.h [S390] perf: add support for s390x CPU counters 2012-03-23 11:13:25 +01:00
pgalloc.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
pgtable.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
poll.h
posix_types.h s390: Always use "long" for ssize_t to match size_t 2012-08-21 15:23:04 +02:00
processor.h s390/mm: downgrade page table after fork of a 31 bit process 2012-07-26 16:24:14 +02:00
ptrace.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
qdio.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
qeth.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
reset.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
resource.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
rwsem.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
scatterlist.h [S390] set ARCH_HAS_SG_CHAIN for s390 2010-10-25 16:10:15 +02:00
schid.h
sclp.h KVM updates for the 3.6 merge window 2012-07-24 12:01:20 -07:00
scsw.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
seccomp.h
sections.h
segment.h
sembuf.h
setup.h s390/mm: rename user_mode variable to addressing_mode 2012-07-30 11:03:11 +02:00
sfp-machine.h
sfp-util.h s390/headers: replace __s390x__ with CONFIG_64BIT where possible 2012-05-24 10:10:10 +02:00
shmbuf.h
shmparam.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
sigcontext.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
siginfo.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
signal.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
sigp.h KVM: s390: Fix sigp sense handling. 2012-07-03 14:55:37 -03:00
smp.h s390/smp: add missing smp_store_status() for !SMP 2012-08-28 10:08:34 +02:00
socket.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
sockios.h [S390] use generic sockios.h header file 2009-12-07 12:51:37 +01:00
sparsemem.h s390/mm: remove MAX_PHYSADDR_BITS define 2012-08-08 07:32:55 -07:00
spinlock.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
spinlock_types.h locking: Convert raw_rwlock to arch_rwlock 2009-12-14 23:55:32 +01:00
stat.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
statfs.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
string.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
swab.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
switch_to.h s390: Remove leftover account_tick_vtime() header 2012-08-20 15:00:39 +02:00
syscall.h s390/seccomp: add support for system call filtering using BPF 2012-08-08 07:32:56 -07:00
sysinfo.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
tape390.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
termbits.h [S390] use generic termbits.h header file 2009-12-07 12:51:37 +01:00
termios.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
thread_info.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
timex.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
tlb.h s390/headers: replace __s390x__ with CONFIG_64BIT where possible 2012-05-24 10:10:10 +02:00
tlbflush.h s390/mm: fix deadlock in unmap_hugepage_range() 2012-09-03 11:14:06 +02:00
topology.h [S390] topology: increase poll frequency if change is anticipated 2011-12-27 11:27:12 +01:00
types.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
uaccess.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
ucontext.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
unaligned.h
unistd.h ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION 2012-07-30 17:25:21 -07:00
user.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
vdso.h s390/headers: remove #ifdef __KERNEL__ from not exported headers 2012-05-24 10:10:05 +02:00
vtimer.h s390/vtimer: rework virtual timer interface 2012-07-20 11:15:08 +02:00
vtoc.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
xor.h
zcrypt.h s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00