kernel.git/arch/sparc/include, branch linux-2.6.37.y

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

2010-12-15T01:34:00Z

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Write to prom console using indirect buffer. sparc: Delete prom_*getchar(). sparc: Pass buffer pointer all the way down to prom_{get,put}char(). sparc: Do not export prom_nb{get,put}char(). sparc64: Delete prom_setcallback(). sparc64: Unexport prom_service_exists(). sparc: Kill prom devops_{32,64}.c sparc: Remove prom_pathtoinode() sparc64: Delete prom_puts() unused. SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ

sparc: Write to prom console using indirect buffer.

2010-12-01T04:15:58Z

sparc64 systems have a restriction in that passing in buffer addressses above 4GB to prom calls is not reliable. We end up violating this when we do prom console writes, because we use an on-stack buffer to translate '\n' into '\r\n'. So instead, do this translation into an intermediate buffer, which is in the kernel image and thus below 4GB, then pass that to the PROM console write calls. On the 32-bit side we don't have to deal with any of these issues, so the new prom_console_write_buf() uses the existing prom_nbputchar() implementation. However we can now mark those routines static. Since the 64-bit side completely uses new code we can delete the putchar bits as they are now completely unused. Signed-off-by: David S. Miller

sparc: Delete prom_*getchar().

2010-11-30T22:53:05Z

Completely unused. Signed-off-by: David S. Miller

sparc: Pass buffer pointer all the way down to prom_{get,put}char().

2010-11-30T22:33:29Z

This gets us closer to being able to eliminate the use of dynamic and stack based buffers, so that we can adhere to the "no buffer addresses above 4GB" rule for PROM calls. Signed-off-by: David S. Miller

sparc: Do not export prom_nb{get,put}char().

2010-11-17T18:22:56Z

Never used outside of console_{32,64}.c Signed-off-by: David S. Miller

sparc64: Delete prom_setcallback().

2010-11-16T20:50:19Z

Unused. Signed-off-by: David S. Miller

sparc64: Unexport prom_service_exists().

2010-11-16T20:24:16Z

Only used by functions in misc_64.c so make it private to that file. Signed-off-by: David S. Miller

sparc: Kill prom devops_{32,64}.c

2010-11-16T20:23:20Z

Completely unused. Signed-off-by: David S. Miller

sparc: Remove prom_pathtoinode()

2010-11-16T20:11:15Z

Unused. Signed-off-by: David S. Miller

Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-10-30T18:43:26Z

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: jump label: Add work around to i386 gcc asm goto bug x86, ftrace: Use safe noops, drop trap test jump_label: Fix unaligned traps on sparc. jump label: Make arch_jump_label_text_poke_early() optional jump label: Fix error with preempt disable holding mutex oprofile: Remove deprecated use of flush_scheduled_work() oprofile: Fix the hang while taking the cpu offline jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex jump label: Fix module __init section race * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Check irq_remapped instead of remapping_enabled in destroy_irq()