Commit b2adf0cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: Fixup last users of irq_chip->typename
  parisc: convert /proc/pdc/{lcd,led} to seq_file
  parisc: Convert BUG() to use unreachable()
  parisc: Replace old style lock init in smp.c
  parisc: use sort() instead of home-made implementation (v2)
  parisc: add CALLER_ADDR{0-6} macros
  parisc: remove unused IRQSTAT_SIRQ_PEND and IRQSTAT_SZ defines
  parisc: remove duplicated #include
parents a79960e5 d0608b54

arch/parisc/include/asm/bug.h

+2 −2
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ 
			     "\t.popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (0), "i" (sizeof(struct bug_entry)) ); \

		for(;;) ;						\

		unreachable();						\

	} while(0)



#else

#define BUG()								\

	do {								\

		asm volatile(PARISC_BUG_BREAK_ASM : : );		\

		for(;;) ;						\

		unreachable();						\

	} while(0)

#endif

arch/parisc/include/asm/ftrace.h

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,20 @@ struct ftrace_ret_stack { 
 * Defined in entry.S

 */

extern void return_to_handler(void);





extern unsigned long return_address(unsigned int);



#define HAVE_ARCH_CALLER_ADDR



#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#define CALLER_ADDR1 return_address(1)

#define CALLER_ADDR2 return_address(2)

#define CALLER_ADDR3 return_address(3)

#define CALLER_ADDR4 return_address(4)

#define CALLER_ADDR5 return_address(5)

#define CALLER_ADDR6 return_address(6)



#endif /* __ASSEMBLY__ */



#endif /* _ASM_PARISC_FTRACE_H */

arch/parisc/kernel/asm-offsets.c

+0 −3
Original line number Diff line number Diff line
@@ -244,9 +244,6 @@ int main(void) 
	DEFINE(THREAD_SZ, sizeof(struct thread_info));

	DEFINE(THREAD_SZ_ALGN, align(sizeof(struct thread_info), 64));

	BLANK();

	DEFINE(IRQSTAT_SIRQ_PEND, offsetof(irq_cpustat_t, __softirq_pending));

	DEFINE(IRQSTAT_SZ, sizeof(irq_cpustat_t));

	BLANK();

	DEFINE(ICACHE_BASE, offsetof(struct pdc_cache_info, ic_base));

	DEFINE(ICACHE_STRIDE, offsetof(struct pdc_cache_info, ic_stride));

	DEFINE(ICACHE_COUNT, offsetof(struct pdc_cache_info, ic_count));

arch/parisc/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest) 
#endif



static struct irq_chip cpu_interrupt_type = {

	.typename	= "CPU",

	.name		= "CPU",

	.startup	= cpu_startup_irq,

	.shutdown	= cpu_disable_irq,

	.enable		= cpu_enable_irq,
@@ -192,7 +192,7 @@ int show_interrupts(struct seq_file *p, void *v) 
		seq_printf(p, "%10u ", kstat_irqs(i));

#endif



		seq_printf(p, " %14s", irq_desc[i].chip->typename);

		seq_printf(p, " %14s", irq_desc[i].chip->name);

#ifndef PARISC_IRQ_CR16_COUNTS

		seq_printf(p, "  %s", action->name);

arch/parisc/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/stddef.h>

#include <linux/compat.h>

#include <linux/elf.h>

#include <linux/tracehook.h>

#include <asm/ucontext.h>

#include <asm/rt_sigframe.h>

#include <asm/uaccess.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE