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

Commit a0aeccdc 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:
  sparc64: Fix NMI startup bug which also breaks perf.
  sparc: fix size argument to find_next_zero_bit()
  sparc: use bitmap_set()
  sparc32: unaligned memory access (MNA) trap handler bug
parents fa7ea87a b62818e5

arch/sparc/include/asm/pcr.h

+2 −0
Original line number Diff line number Diff line
@@ -43,4 +43,6 @@ static inline u64 picl_value(unsigned int nmi_hz) 


extern u64 pcr_enable;



extern int pcr_arch_init(void);



#endif /* __PCR_H */

arch/sparc/kernel/iommu.c

+2 −3
Original line number Diff line number Diff line
@@ -255,10 +255,9 @@ static inline iopte_t *alloc_npages(struct device *dev, struct iommu *iommu, 
static int iommu_alloc_ctx(struct iommu *iommu)

{

	int lowest = iommu->ctx_lowest_free;

	int sz = IOMMU_NUM_CTXS - lowest;

	int n = find_next_zero_bit(iommu->ctx_bitmap, sz, lowest);

	int n = find_next_zero_bit(iommu->ctx_bitmap, IOMMU_NUM_CTXS, lowest);



	if (unlikely(n == sz)) {

	if (unlikely(n == IOMMU_NUM_CTXS)) {

		n = find_next_zero_bit(iommu->ctx_bitmap, lowest, 1);

		if (unlikely(n == lowest)) {

			printk(KERN_WARNING "IOMMU: Ran out of contexts.\n");

arch/sparc/kernel/pcr.c

+0 −2
Original line number Diff line number Diff line
@@ -167,5 +167,3 @@ int __init pcr_arch_init(void) 
	unregister_perf_hsvc();

	return err;

}
 


early_initcall(pcr_arch_init);

arch/sparc/kernel/smp_64.c

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/mdesc.h>

#include <asm/ldc.h>

#include <asm/hypervisor.h>

#include <asm/pcr.h>



#include "cpumap.h"
@@ -1358,6 +1359,7 @@ void __cpu_die(unsigned int cpu) 


void __init smp_cpus_done(unsigned int max_cpus)

{

	pcr_arch_init();

}



void smp_send_reschedule(int cpu)

arch/sparc/kernel/una_asm_32.S

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ retl_efault: 
	.globl	__do_int_store

__do_int_store:

	ld	[%o2], %g1

	cmp	%1, 2

	cmp	%o1, 2

	be	2f

	 cmp	%1, 4

	 cmp	%o1, 4

	be	1f

	 srl	%g1, 24, %g2

	srl	%g1, 16, %g7