Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull sparc fixes from David Miller:
 "Various sparc bug fixes, in particular:

  1) TSB hashes have to be flushed before TLB on sparc64, from Dave
     Kleikamp.

  2) LEON timer interrupts can get stuck, from Andreas Larsson.

  3) Sparc64 needs to handle lack of address-congruence devicetree
     property, from Bob Picco"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: tsb must be flushed before tlb
  sparc,leon: Convert to use devm_ioremap_resource
  sparc64 address-congruence property
  sparc32, leon: Enable interrupts before going idle to avoid getting stuck
  sparc32, leon: Remove separate "ticker" timer for SMP
  sparc: kernel: using strlcpy() instead of strcpy()
  arch: sparc: prom: looping issue, need additional length check in the outside looping
  sparc: remove inline marking of EXPORT_SYMBOL functions
  sparc: Switch to asm-generic/linkage.h
parents aa4927b9 23a01138

arch/sparc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ generic-y += cputime.h 
generic-y += div64.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += linkage.h

generic-y += local64.h

generic-y += mutex.h

generic-y += irq_regs.h

arch/sparc/include/asm/leon.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static inline int sparc_leon3_cpuid(void) 


#ifdef CONFIG_SMP

# define LEON3_IRQ_IPI_DEFAULT		13

# define LEON3_IRQ_TICKER		(leon3_ticker_irq)

# define LEON3_IRQ_TICKER		(leon3_gptimer_irq)

# define LEON3_IRQ_CROSS_CALL		15

#endif

arch/sparc/include/asm/leon_amba.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct amba_prom_registers { 
#define LEON3_GPTIMER_LD 4

#define LEON3_GPTIMER_IRQEN 8

#define LEON3_GPTIMER_SEPIRQ 8

#define LEON3_GPTIMER_TIMERS 0x7



#define LEON23_REG_TIMER_CONTROL_EN    0x00000001 /* 1 = enable counting */

/* 0 = hold scalar and counter */

arch/sparc/include/asm/linkage.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_LINKAGE_H

#define __ASM_LINKAGE_H



/* Nothing to see here... */



#endif

arch/sparc/kernel/ds.c

+2 −1
Original line number Diff line number Diff line
@@ -843,7 +843,8 @@ void ldom_reboot(const char *boot_command) 
		unsigned long len;



		strcpy(full_boot_str, "boot ");

		strcpy(full_boot_str + strlen("boot "), boot_command);

		strlcpy(full_boot_str + strlen("boot "), boot_command,

			sizeof(full_boot_str + strlen("boot ")));

		len = strlen(full_boot_str);



		if (reboot_data_supported) {