mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/
synced 2026-04-03 23:37:40 -04:00
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
Pull ARM updates from Russell King: - avoid %pK for ARM MM prints - implement ARCH_HAS_CC_CAN_LINK to ensure runnable user progs - handle BE8 and BE32 for user progs * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux: ARM: 9470/1: Handle BE8 vs BE32 in ARCH_CC_CAN_LINK ARM: 9469/1: Implement ARCH_HAS_CC_CAN_LINK ARM: 9467/1: mm: Don't use %pK through printk
This commit is contained in:
@@ -6,6 +6,7 @@ config ARM
|
||||
select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND
|
||||
select ARCH_HAS_BINFMT_FLAT
|
||||
select ARCH_HAS_CACHE_LINE_SIZE if OF
|
||||
select ARCH_HAS_CC_CAN_LINK
|
||||
select ARCH_HAS_CPU_CACHE_ALIASING
|
||||
select ARCH_HAS_CPU_FINALIZE_INIT if MMU
|
||||
select ARCH_HAS_CURRENT_STACK_POINTER
|
||||
@@ -1716,6 +1717,18 @@ config KERNEL_MODE_NEON
|
||||
|
||||
endmenu
|
||||
|
||||
config ARCH_CC_CAN_LINK
|
||||
bool
|
||||
default $(cc_can_link_user,-mlittle-endian) if CPU_LITTLE_ENDIAN
|
||||
default $(cc_can_link_user,-mbig-endian -mbe8) if CPU_ENDIAN_BE8
|
||||
default $(cc_can_link_user,-mbig-endian -mbe32) if CPU_ENDIAN_BE32
|
||||
|
||||
config ARCH_USERFLAGS
|
||||
string
|
||||
default "-mlittle-endian" if CPU_LITTLE_ENDIAN
|
||||
default "-mbig-endian -mbe8" if CPU_ENDIAN_BE8
|
||||
default "-mbig-endian -mbe32" if CPU_ENDIAN_BE32
|
||||
|
||||
menu "Power management options"
|
||||
|
||||
source "kernel/power/Kconfig"
|
||||
|
||||
@@ -38,7 +38,7 @@ static inline bool __virt_addr_valid(unsigned long x)
|
||||
phys_addr_t __virt_to_phys(unsigned long x)
|
||||
{
|
||||
WARN(!__virt_addr_valid(x),
|
||||
"virt_to_phys used for non-linear address: %pK (%pS)\n",
|
||||
"virt_to_phys used for non-linear address: %px (%pS)\n",
|
||||
(void *)x, (void *)x);
|
||||
|
||||
return __virt_to_phys_nodebug(x);
|
||||
|
||||
Reference in New Issue
Block a user