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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: using HZ needs an include of linux/param.h
  sparc32: convert to asm-generic/hardirq.h
  sparc64: Cache per-cpu %pcr register value in perf code.
  sparc64: Fix comment typo in perf_event.c
  sparc64: Minor coding style fixups in perf code.
  sparc64: Add a basic conflict engine in preparation for multi-counter support.
  sparc64: Increase vmalloc size to fix percpu regressions.
  sparc64: Add initial perf event conflict resolution and checks.
  sparc: Niagara1 perf event support.
  sparc: Add Niagara2 HW cache event support.
  sparc: Support all ultra3 and ultra4 derivatives.
  sparc: Support HW cache events.
parents ed3c6614 c4a57435

arch/sparc/include/asm/hardirq_32.h

+1 −11
Original line number Diff line number Diff line
@@ -7,17 +7,7 @@ 
#ifndef __SPARC_HARDIRQ_H

#define __SPARC_HARDIRQ_H



#include <linux/threads.h>

#include <linux/spinlock.h>

#include <linux/cache.h>



/* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */

typedef struct {

	unsigned int __softirq_pending;

} ____cacheline_aligned irq_cpustat_t;



#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */



#define HARDIRQ_BITS    8

#include <asm-generic/hardirq.h>



#endif /* __SPARC_HARDIRQ_H */

arch/sparc/include/asm/irq_32.h

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
#ifndef _SPARC_IRQ_H

#define _SPARC_IRQ_H



#include <linux/interrupt.h>



#define NR_IRQS    16



#include <linux/interrupt.h>



#define irq_canonicalize(irq)	(irq)



extern void __init init_IRQ(void);

arch/sparc/include/asm/pgtable_64.h

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
#define LOW_OBP_ADDRESS		_AC(0x00000000f0000000,UL)

#define HI_OBP_ADDRESS		_AC(0x0000000100000000,UL)

#define VMALLOC_START		_AC(0x0000000100000000,UL)

#define VMALLOC_END		_AC(0x0000000200000000,UL)

#define VMEMMAP_BASE		_AC(0x0000000200000000,UL)

#define VMALLOC_END		_AC(0x0000010000000000,UL)

#define VMEMMAP_BASE		_AC(0x0000010000000000,UL)



#define vmemmap			((struct page *)VMEMMAP_BASE)

arch/sparc/kernel/ktlb.S

+4 −4
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ kvmap_dtlb_nonlinear: 


#ifdef CONFIG_SPARSEMEM_VMEMMAP

	/* Do not use the TSB for vmemmap.  */

	mov		(VMEMMAP_BASE >> 24), %g5

	sllx		%g5, 24, %g5

	mov		(VMEMMAP_BASE >> 40), %g5

	sllx		%g5, 40, %g5

	cmp		%g4,%g5

	bgeu,pn		%xcc, kvmap_vmemmap

	 nop
@@ -293,8 +293,8 @@ kvmap_dtlb_tsbmiss: 
	sethi		%hi(MODULES_VADDR), %g5

	cmp		%g4, %g5

	blu,pn		%xcc, kvmap_dtlb_longpath

	 mov		(VMALLOC_END >> 24), %g5

	sllx		%g5, 24, %g5

	 mov		(VMALLOC_END >> 40), %g5

	sllx		%g5, 40, %g5

	cmp		%g4, %g5

	bgeu,pn		%xcc, kvmap_dtlb_longpath

	 nop

arch/sparc/kernel/perf_event.c

+537 −40

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE