forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/arch/arm/include/asm
History
Tao Huang 640193f76b Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git 
* linux-linaro-lsk-v4.4-android: (733 commits)
  LSK-ANDROID: memcg: Remove wrong ->attach callback
  LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
  ANDROID: sdcardfs: Move default_normal to superblock
  blkdev: Refactoring block io latency histogram codes
  FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
  FROMLIST: arm64: Move post_ttbr_update_workaround to C code
  FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
  sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path
  fscrypt: updates on 4.15-rc4
  ANDROID: uid_sys_stats: fix the comment
  BACKPORT: tee: indicate privileged dev in gen_caps
  BACKPORT: tee: optee: sync with new naming of interrupts
  BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
  BACKPORT: tee: optee: interruptible RPC sleep
  BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
  BACKPORT: tee.txt: standardize document format
  BACKPORT: tee: add forward declaration for struct device
  BACKPORT: tee: optee: fix uninitialized symbol 'parg'
  BACKPORT: tee: add ARM_SMCCC dependency
  BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
  ...

Conflicts:
	arch/arm64/kernel/vdso.c
	drivers/usb/host/xhci-plat.c
	include/drm/drmP.h
	include/linux/kasan.h
	kernel/time/timekeeping.c
	mm/kasan/kasan.c
	security/selinux/nlmsgtab.c

Also add this commit:
0bcdc0987c ("time: Fix ktime_get_raw() incorrect base accumulation")
2018-01-26 19:26:47 +08:00
..
hardware rk: revert to v3.10 2015-11-11 15:57:28 +08:00
mach Revert "Recreate asm/mach/mmc.h include file" 2016-05-19 12:35:13 +05:30
xen xen/arm: correctly handle DMA mapping of compound pages 2016-03-03 15:07:30 -08:00
arch_gicv3.h irqchip/gic-v3: Add missing include for barrier.h 2015-12-10 19:13:26 +01:00
arch_timer.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
arm-cci.h arm-cci: Get rid of secure transactions for PMU driver 2015-03-27 13:44:35 +00:00
asm-offsets.h
assembler.h ARM: BUG if jumping to usermode address in kernel mode 2017-12-16 10:33:50 +01:00
atomic.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
auxvec.h ARM: 8329/1: miscellaneous vdso infrastructure, preparation 2015-03-27 22:20:45 +00:00
barrier.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
bitops.h ARM: 8417/1: refactor bitops functions with BIT_MASK() and BIT_WORD() 2015-08-18 14:00:30 +01:00
bitrev.h ARM: 8287/1: add bitrev.h file to support rbit instruction 2015-01-16 14:06:18 +00:00
bL_switcher.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
bug.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
bugs.h
cache.h
cacheflush.h asm-generic: Consolidate mark_rodata_ro() 2016-03-17 18:51:51 +00:00
cachetype.h
checksum.h ARM: fix csum_tcpudp_magic() miscompilation 2013-12-29 12:32:41 +00:00
clkdev.h clk: Add common __clk_get(), __clk_put() implementations 2013-12-04 17:19:44 +01:00
cmpxchg.h ARM: 8443/1: Adding support for atomic half word exchange 2015-10-09 16:22:54 +01:00
compiler.h ARM: 8300/1: teach __asmeq that r11 == fp and r12 == ip 2015-02-10 10:23:11 +00:00
cp15.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
cpu.h
cpuidle.h ARM: 8485/1: cpuidle: remove cpu parameter from the cpuidle_ops suspend hook 2016-11-21 11:48:09 +08:00
cputype.h ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs 2017-01-26 08:23:49 +01:00
cti.h
dcc.h ARM: tty: Move HVC DCC assembly to arch/arm 2014-05-28 13:33:18 -07:00
delay.h
device.h FROMLIST: iommu: dma-iommu: use common implementation also on ARM architecture 2016-03-18 20:43:24 +08:00
div64.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
dma-contiguous.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
dma-mapping.h Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git 2016-11-04 14:30:24 +08:00
dma.h remove <asm/scatterlist.h> 2015-05-05 13:35:39 -06:00
domain.h ARM: domains: add memory dependencies to get_domain/set_domain 2015-09-11 16:08:18 +01:00
ecard.h
edac.h EDAC: Cleanup atomic_scrub mess 2015-05-28 15:31:53 +02:00
elf.h ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB" 2017-11-20 21:15:59 +05:30
entry-macro-multi.S ARM: replace BSYM() with badr assembly macro 2015-05-08 17:33:50 +01:00
exception.h UPSTREAM: arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections 2018-01-22 13:15:43 +05:30
fb.h
fiq.h
fiq_glue.h ARM: fiq_glue: Add custom fiq return handler api. 2016-02-16 13:52:26 -08:00
firmware.h ARM: EXYNOS: add exynos_get_boot_addr() helper 2015-06-06 02:17:56 +09:00
fixmap.h ARM: 8415/1: early fixmap support for earlycon 2015-08-18 14:00:29 +01:00
flat.h
floppy.h ARM: 8584/1: floppy: avoid gcc-6 warning 2016-11-10 16:36:36 +01:00
fncpy.h rk: temp revert rk change 2015-11-11 15:54:30 +08:00
fpstate.h
ftrace.h ARM: 8632/1: ftrace: fix syscall name matching 2017-08-11 09:08:58 -07:00
futex.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
glue-cache.h ARM: reduce visibility of dmac_* functions 2015-08-01 22:25:04 +01:00
glue-df.h ARM: 8065/1: remove last use of CONFIG_CPU_ARM710 2014-05-30 01:12:30 +01:00
glue-pf.h
glue-proc.h ARM: 8103/1: save/restore Cortex-A9 CP15 registers on suspend/resume 2014-07-18 12:29:37 +01:00
glue.h
gpio.h ARM: delete old reference to ARM_GPIOLIB_COMPLEX 2014-06-30 21:37:39 +02:00
hardirq.h UPSTREAM: ARM: 8487/1: Remove IPI_CALL_FUNC_SINGLE 2018-01-04 09:20:14 +08:00
highmem.h kmap_atomic_to_page() has no users, remove it 2015-11-09 15:11:24 -08:00
hugetlb-3level.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
hugetlb.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
hw_breakpoint.h ARM: 7948/1: hw_breakpoint: Add ARMv8 support 2014-02-10 11:48:05 +00:00
hw_irq.h ARM: Remove ununsed set_irq_flags 2015-09-16 16:53:39 +02:00
hwcap.h ARM: 7981/1: add support for AT_HWCAP2 ELF auxv entry 2014-02-25 11:40:48 +00:00
hypervisor.h
ide.h
idmap.h
insn.h ARM: kprobes: enable OPTPROBES for ARM 32 2015-01-13 16:10:17 +00:00
io.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
irq.h xen/events: Always allocate legacy interrupts on PV guests 2015-11-26 18:05:01 +00:00
irq_work.h arm: Tell irq work about self IPI support 2014-09-13 18:38:39 +02:00
irqflags.h ARM: 8422/1: enable imprecise aborts during early kernel startup 2015-09-22 08:13:56 +01:00
jump_label.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
Kbuild ARM: 8715/1: add a private asm/unaligned.h 2017-11-08 10:06:28 +01:00
kexec.h
kgdb.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
kmap_types.h
kprobes.h ARM: optprobes: execute instruction during restoring if possible. 2015-01-14 12:24:52 +00:00
kvm_arm.h Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4 2017-12-19 13:06:55 +08:00
kvm_asm.h arm64: kvm: deal with kernel symbols outside of linear mapping 2016-11-17 09:49:36 +08:00
kvm_coproc.h
kvm_emulate.h arm64: KVM: Correctly handle zero register during MMIO 2015-12-04 16:29:37 +00:00
kvm_host.h arm64: kvm: allows kvm cpu hotplug 2016-11-17 09:49:39 +08:00
kvm_mmio.h KVM: arm/arm64: rework MMIO abort handling to use KVM MMIO bus 2015-03-30 17:07:19 +01:00
kvm_mmu.h Merge tag 'v4.4.55' into linux-linaro-lsk-v4.4 2017-03-20 12:03:07 +08:00
kvm_psci.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
limits.h
linkage.h
mach-types.h
mc146818rtc.h
mcpm.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
mcs_spinlock.h ARM: 8098/1: mcs lock: implement wfe-based polling for MCS locking 2014-07-18 12:29:35 +01:00
memblock.h ARM: 8025/1: Get rid of meminfo 2014-06-01 01:17:12 +01:00
memory.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
mmu.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
mmu_context.h ARM: Hide finish_arch_post_lock_switch() from modules 2017-12-25 14:22:09 +01:00
module.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
mpu.h
mtd-xip.h
mutex.h
neon.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
nwflash.h
opcodes-sec.h
opcodes-virt.h
opcodes.h
outercache.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
page-nommu.h
page.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
patch.h ARM: probes: move all probe code to dedicate directory 2015-01-09 09:36:50 +00:00
pci.h PCI: Remove unused pci_dma_burst_advice() 2015-06-08 07:56:43 -05:00
percpu.h ARM: 8174/1: Use global stack register variable for percpu 2014-11-13 23:58:06 +00:00
perf_event.h arm: perf: Fix callchain parse error with kernel tracepoint events 2015-05-27 16:12:05 +01:00
pgalloc.h ARM: 8235/1: Support for the PXN CPU feature on ARMv7 2014-12-03 15:57:45 +00:00
pgtable-2level-hwdef.h ARM: domains: keep vectors in separate domain 2015-08-21 13:55:53 +01:00
pgtable-2level-types.h
pgtable-2level.h ARM: 8578/1: mm: ensure pmd_present only checks the valid bit 2016-07-27 09:47:30 -07:00
pgtable-3level-hwdef.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
pgtable-3level-types.h
pgtable-3level.h UPSTREAM: arch/arm/include/asm/pgtable-3level.h: add pmd_mkclean for THP 2016-10-12 17:34:22 +05:30
pgtable-hwdef.h
pgtable-nommu.h mm: make FIRST_USER_ADDRESS unsigned long on all archs 2015-02-11 17:06:03 -08:00
pgtable.h ARM: 8578/1: mm: ensure pmd_present only checks the valid bit 2016-07-27 09:47:30 -07:00
probes.h ARM: optprobes: execute instruction during restoring if possible. 2015-01-14 12:24:52 +00:00
proc-fns.h ARM: redo TTBR setup code for LPAE 2015-06-01 23:48:19 +01:00
processor.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
procinfo.h
prom.h of/fdt: move memreserve and dtb memory reservations into core 2014-04-30 00:59:17 -05:00
psci.h ARM: 8457/1: psci-smp is built only for SMP 2016-03-03 15:07:08 -08:00
ptrace.h arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature 2016-10-20 15:38:13 +08:00
setup.h ARM: 8025/1: Get rid of meminfo 2014-06-01 01:17:12 +01:00
shmparam.h
signal.h
smp.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
smp_plat.h ARM: 8392/3: smp: Only expose /sys/.../cpuX/online if hotpluggable 2015-07-31 18:58:30 +01:00
smp_scu.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
smp_twd.h
sparsemem.h
spinlock.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
spinlock_types.h
stackprotector.h
stacktrace.h ARM: 8070/1: Introduce arm_get_current_stack_frame() 2014-07-18 12:29:11 +01:00
string.h
suspend.h rk: temp revert rk change 2015-11-11 15:54:30 +08:00
swab.h
switch_to.h sched, arm: Remove finish_arch_switch() 2015-08-04 09:37:52 +02:00
sync_bitops.h ARM: 7989/1: Delete asm/system.h 2014-02-25 11:33:37 +00:00
syscall.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
system_info.h ARM: 8355/1: arch: Show the serial number from devicetree in cpuinfo 2015-05-08 10:42:35 +01:00
system_misc.h
tcm.h
therm.h
thread_info.h ARM: rockchip: Add workaround for unknown write of thread_info 2017-05-18 11:33:04 +08:00
thread_notify.h
timex.h ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too 2013-12-20 17:17:16 +01:00
tlb.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
tlbflush.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
tls.h ARM: 8178/1: fix set_tls for !CONFIG_KUSER_HELPERS 2014-09-30 16:55:23 +01:00
topology.h arm: Fix build error "conflicting types for 'scale_cpu_capacity'" 2016-09-14 15:17:01 +05:30
traps.h BACKPORT: irq: Make the irqentry text section unconditional 2018-01-22 13:15:43 +05:30
trusted_foundations.h ARM: trusted_foundations: fix compile error on non-SMP 2014-05-23 21:28:11 +02:00
types.h
uaccess.h ARM: uaccess: Enable hardened usercopy 2016-08-27 11:23:38 +08:00
ucontext.h
unaligned.h ARM: 8715/1: add a private asm/unaligned.h 2017-11-08 10:06:28 +01:00
unified.h ARM: replace BSYM() with badr assembly macro 2015-05-08 17:33:50 +01:00
unistd.h rk: revert to v3.10 2015-11-11 15:57:28 +08:00
unwind.h
uprobes.h ARM: add uprobes support 2014-03-18 16:39:40 -04:00
user.h
v7m.h
vdso.h ARM: 8329/1: miscellaneous vdso infrastructure, preparation 2015-03-27 22:20:45 +00:00
vdso_datapage.h ARM: 8329/1: miscellaneous vdso infrastructure, preparation 2015-03-27 22:20:45 +00:00
vfp.h ARM: vfp: Add vfp_disable for problematic platforms 2015-05-20 15:07:00 -07:00
vfpmacros.h
vga.h
virt.h arm/arm64: Add new is_kernel_in_hyp_mode predicate 2016-11-09 22:15:48 +08:00
word-at-a-time.h ARM: 8322/1: keep .text and .fixup regions closer together 2015-03-29 23:11:56 +01:00
xor.h