Skip to content

Commit a95f71a

Browse files
committed
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
2 parents f283371 + 561f60d commit a95f71a

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

arch/arm/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config ARM
66
select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND
77
select ARCH_HAS_BINFMT_FLAT
88
select ARCH_HAS_CACHE_LINE_SIZE if OF
9+
select ARCH_HAS_CC_CAN_LINK
910
select ARCH_HAS_CPU_CACHE_ALIASING
1011
select ARCH_HAS_CPU_FINALIZE_INIT if MMU
1112
select ARCH_HAS_CURRENT_STACK_POINTER
@@ -1716,6 +1717,18 @@ config KERNEL_MODE_NEON
17161717

17171718
endmenu
17181719

1720+
config ARCH_CC_CAN_LINK
1721+
bool
1722+
default $(cc_can_link_user,-mlittle-endian) if CPU_LITTLE_ENDIAN
1723+
default $(cc_can_link_user,-mbig-endian -mbe8) if CPU_ENDIAN_BE8
1724+
default $(cc_can_link_user,-mbig-endian -mbe32) if CPU_ENDIAN_BE32
1725+
1726+
config ARCH_USERFLAGS
1727+
string
1728+
default "-mlittle-endian" if CPU_LITTLE_ENDIAN
1729+
default "-mbig-endian -mbe8" if CPU_ENDIAN_BE8
1730+
default "-mbig-endian -mbe32" if CPU_ENDIAN_BE32
1731+
17191732
menu "Power management options"
17201733

17211734
source "kernel/power/Kconfig"

arch/arm/mm/physaddr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static inline bool __virt_addr_valid(unsigned long x)
3838
phys_addr_t __virt_to_phys(unsigned long x)
3939
{
4040
WARN(!__virt_addr_valid(x),
41-
"virt_to_phys used for non-linear address: %pK (%pS)\n",
41+
"virt_to_phys used for non-linear address: %px (%pS)\n",
4242
(void *)x, (void *)x);
4343

4444
return __virt_to_phys_nodebug(x);

0 commit comments

Comments
 (0)