* linux-next: manual merge of the rr tree with the arm tree
@ 2012-02-29 2:29 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-02-29 2:29 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, Rabin Vincent, Russell King
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/arm/kernel/kprobes.c between commit 214f3e7464bc ("ARM: 7332/1:
extract out code patch function from kprobes") from the arm tree and
commit 8dcf0d7856cf ("remove references to cpu_*_map in arch/") from the
rr tree.
The former moved part of the code modified by the latter into another
file and, in doing so, applied the appropriate fixup. So I just used the
arm version of arch_arm_kprobe() - the patch to arch_disarm_kprobe() is
still required.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: manual merge of the rr tree with the arm tree
@ 2012-07-26 1:59 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-07-26 1:59 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-next, linux-kernel, David Howells, Will Deacon, Russell King
[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/arm/Kconfig between commits 8c56cc8be5b3 ("ARM: 7449/1: use generic
strnlen_user and strncpy_from_user functions") and b9a50f74905a ("ARM:
7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs")
from the arm tree and commit 380470027b5c ("Make most arch asm/module.h
files use asm-generic/module.h") from the rr tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/Kconfig
index 71257da,af8bf36..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -45,9 -45,8 +45,11 @@@ config AR
select GENERIC_SMP_IDLE_THREAD
select KTIME_SCALAR
select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN
+ select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
+ select MODULES_USE_ELF_REL
help
The ARM series is a line of low-power-consumption RISC chip designs
licensed by ARM Ltd and targeted at embedded applications and
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: manual merge of the rr tree with the arm tree
@ 2009-11-25 5:21 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-11-25 5:21 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-next, linux-kernel, Alan Jenkins, Nelson Elhage,
Tim Abbott, Russell King
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/arm/kernel/vmlinux.lds.S between commit
78d7530ac338e458fa513527ee7bb4278d0d8017 ("ARM: Clean up linker script
using new linker script macros") from the arm tree and commit
0a5e2c8918d0945f6384e104050c5234057455df ("ARM: use unified discard
definition in linker script") from the rr tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/kernel/vmlinux.lds.S
index 71151bd,ec511d4..0000000
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@ -58,18 -77,13 +58,18 @@@ SECTION
#endif
}
+ PERCPU(PAGE_SIZE)
+
+#ifndef CONFIG_XIP_KERNEL
+ . = ALIGN(PAGE_SIZE);
+ __init_end = .;
+#endif
+
- /DISCARD/ : { /* Exit code and data */
- EXIT_TEXT
- EXIT_DATA
- *(.exitcall.exit)
- *(.discard)
+ /*
+ * unwind exit sections must be discarded before the rest of the
+ * unwind sections get included.
+ */
+ /DISCARD/ : {
*(.ARM.exidx.exit.text)
*(.ARM.extab.exit.text)
#ifndef CONFIG_HOTPLUG_CPU
@@@ -233,11 -256,24 +233,14 @@@
}
#endif
- .bss : {
- __bss_start = .; /* BSS */
- *(.bss)
- *(COMMON)
- __bss_stop = .;
- _end = .;
- }
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
+ BSS_SECTION(0, 0, 0)
+ _end = .;
+
+ STABS_DEBUG
.comment 0 : { *(.comment) }
+
+ /* Default discards */
+ DISCARDS
}
/*
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-26 2:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-29 2:29 linux-next: manual merge of the rr tree with the arm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-07-26 1:59 Stephen Rothwell
2009-11-25 5:21 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®