Skip to contentSkip to conversation

sh updates for 2.6.31-rc1, part 3.

GIT PULL Paul Mundt 2 participants 3 messages Jun 23, 2009 – Jun 24, 2009

lore
Share & tools
lore

Paul Mundt

author
#0 lore raw

Nothing too interesting here, mostly SMP fixups aimed at SH7786.. A couple of build issues popped up in the last few days as well, so clean those up too.

Please pull from:

master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

Which contains:

Paul Mundt (6):
sh: Provide cpu_idle_wait() to fix up cpuidle/SMP build.
sh: Use local TLB flush in set_pte_phys().
sh: Wire up the uncached fixmap on sh64 as well.
sh: SH7786 SMP support.
sh: Fix up more dma-mapping fallout.
sh: Fix up HAVE_PERF_COUNTERS typo.

 arch/sh/Kconfig                        |   12 ++++++++++--
 arch/sh/include/asm/dma-mapping.h      |   12 ++++++------
 arch/sh/include/asm/system.h           |    1 +
 arch/sh/kernel/cpu/sh4a/Makefile       |    6 +++---
 arch/sh/kernel/cpu/sh4a/setup-sh7786.c |   29 +++++++++--------------------
 arch/sh/kernel/idle.c                  |   23 ++++++++++++++++++++++-
 arch/sh/mm/init.c                      |    4 +---
 7 files changed, 52 insertions(+), 35 deletions(-)
#1 lore raw
Quoted 2 lines · Paul Mundt

sh: Fix up HAVE_PERF_COUNTERS typo.

just fyi while wiring this up myself...

Your set_perf_counter_pending when CONFIG_PERF_COUNTERS=y is wrong, as it's a extern in <linux/perf_counters.h>, you'll probably want to make it a static inline. (Yeah, I blagged your header. ;-)

cheers, Kyle

author
#2 lore raw
Quoted 10 lines · Kyle McMartin
Quoted 2 lines · Paul Mundt

sh: Fix up HAVE_PERF_COUNTERS typo.

just fyi while wiring this up myself...

Your set_perf_counter_pending when CONFIG_PERF_COUNTERS=y is wrong, as it's a extern in <linux/perf_counters.h>, you'll probably want to make it a static inline. (Yeah, I blagged your header. ;-)

Figures, I copied it from an earlier x86 version ;-)

I'll fix it up, thanks for the note.