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

Commit 6df8cd3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: ERROR: "sys_ioctl" [arch/sparc64/solaris/solaris.ko] undefined!
  [SPARC32]: Make PAGE_SHARED a read-mostly variable.
  [SPARC32]: Take enable_irq/disable_irq out of line.
  [SPARC32]: clean include/asm-sparc/irq.h
  [SPARC32]: Fix rounding errors in ndelay/udelay implementation.
parents 08f1c192 3167d93f

arch/sparc/kernel/entry.S

+10 −4
Original line number Diff line number Diff line
@@ -1749,8 +1749,8 @@ fpload: 
__ndelay:

	save	%sp, -STACKFRAME_SZ, %sp

	mov	%i0, %o0

	call	.umul

	 mov	0x1ad, %o1		! 2**32 / (1 000 000 000 / HZ)

	call	.umul			! round multiplier up so large ns ok

	 mov	0x1ae, %o1		! 2**32 / (1 000 000 000 / HZ)

	call	.umul

	 mov	%i1, %o1		! udelay_val

	ba	delay_continue
@@ -1760,11 +1760,17 @@ __ndelay: 
__udelay:

	save	%sp, -STACKFRAME_SZ, %sp

	mov	%i0, %o0

	sethi	%hi(0x10c6), %o1

	sethi	%hi(0x10c7), %o1	! round multiplier up so large us ok

	call	.umul

	 or	%o1, %lo(0x10c6), %o1	! 2**32 / 1 000 000

	 or	%o1, %lo(0x10c7), %o1	! 2**32 / 1 000 000

	call	.umul

	 mov	%i1, %o1		! udelay_val

	sethi	%hi(0x028f4b62), %l0	! Add in rounding constant * 2**32,

	or	%g0, %lo(0x028f4b62), %l0

	addcc	%o0, %l0, %o0		! 2**32 * 0.009 999

	bcs,a	3f

	 add	%o1, 0x01, %o1

3:

	call	.umul

	 mov	HZ, %o0			! >>32 earlier for wider range

arch/sparc/kernel/irq.c

+24 −3
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#include <asm/cacheflush.h>

#include <asm/irq_regs.h>



#include "irq.h"



#ifdef CONFIG_SMP

#define SMP_NOP2 "nop; nop;\n\t"

#define SMP_NOP3 "nop; nop; nop;\n\t"
@@ -268,7 +270,7 @@ void free_irq(unsigned int irq, void *dev_id) 
	kfree(action);



	if (!sparc_irq[cpu_irq].action)

		disable_irq(irq);

		__disable_irq(irq);



out_unlock:

	spin_unlock_irqrestore(&irq_action_lock, flags);
@@ -464,7 +466,7 @@ int request_fast_irq(unsigned int irq, 


	sparc_irq[cpu_irq].action = action;



	enable_irq(irq);

	__enable_irq(irq);



	ret = 0;

out_unlock:
@@ -544,7 +546,7 @@ int request_irq(unsigned int irq, 


	*actionp = action;



	enable_irq(irq);

	__enable_irq(irq);



	ret = 0;

out_unlock:
@@ -555,6 +557,25 @@ out: 


EXPORT_SYMBOL(request_irq);



void disable_irq_nosync(unsigned int irq)

{

	return __disable_irq(irq);

}

EXPORT_SYMBOL(disable_irq_nosync);



void disable_irq(unsigned int irq)

{

	return __disable_irq(irq);

}

EXPORT_SYMBOL(disable_irq);



void enable_irq(unsigned int irq)

{

	return __enable_irq(irq);

}



EXPORT_SYMBOL(enable_irq);



/* We really don't need these at all on the Sparc.  We only have

 * stubs here because they are exported to modules.

 */

arch/sparc/kernel/irq.h

0 → 100644
+68 −0
Original line number Diff line number Diff line 
#include <asm/btfixup.h>



/* Dave Redman (djhr@tadpole.co.uk)

 * changed these to function pointers.. it saves cycles and will allow

 * the irq dependencies to be split into different files at a later date

 * sun4c_irq.c, sun4m_irq.c etc so we could reduce the kernel size.

 * Jakub Jelinek (jj@sunsite.mff.cuni.cz)

 * Changed these to btfixup entities... It saves cycles :)

 */



BTFIXUPDEF_CALL(void, disable_irq, unsigned int)

BTFIXUPDEF_CALL(void, enable_irq, unsigned int)

BTFIXUPDEF_CALL(void, disable_pil_irq, unsigned int)

BTFIXUPDEF_CALL(void, enable_pil_irq, unsigned int)

BTFIXUPDEF_CALL(void, clear_clock_irq, void)

BTFIXUPDEF_CALL(void, clear_profile_irq, int)

BTFIXUPDEF_CALL(void, load_profile_irq, int, unsigned int)



static inline void __disable_irq(unsigned int irq)

{

	BTFIXUP_CALL(disable_irq)(irq);

}



static inline void __enable_irq(unsigned int irq)

{

	BTFIXUP_CALL(enable_irq)(irq);

}



static inline void disable_pil_irq(unsigned int irq)

{

	BTFIXUP_CALL(disable_pil_irq)(irq);

}



static inline void enable_pil_irq(unsigned int irq)

{

	BTFIXUP_CALL(enable_pil_irq)(irq);

}



static inline void clear_clock_irq(void)

{

	BTFIXUP_CALL(clear_clock_irq)();

}



static inline void clear_profile_irq(int irq)

{

	BTFIXUP_CALL(clear_profile_irq)(irq);

}



static inline void load_profile_irq(int cpu, int limit)

{

	BTFIXUP_CALL(load_profile_irq)(cpu, limit);

}



extern void (*sparc_init_timers)(irq_handler_t lvl10_irq);



extern void claim_ticker14(irq_handler_t irq_handler,

			   int irq,

			   unsigned int timeout);



#ifdef CONFIG_SMP

BTFIXUPDEF_CALL(void, set_cpu_int, int, int)

BTFIXUPDEF_CALL(void, clear_cpu_int, int, int)

BTFIXUPDEF_CALL(void, set_irq_udt, int)



#define set_cpu_int(cpu,level) BTFIXUP_CALL(set_cpu_int)(cpu,level)

#define clear_cpu_int(cpu,level) BTFIXUP_CALL(clear_cpu_int)(cpu,level)

#define set_irq_udt(cpu) BTFIXUP_CALL(set_irq_udt)(cpu)

#endif

arch/sparc/kernel/pcic.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/uaccess.h>

#include <asm/irq_regs.h>



#include "irq.h"



/*

 * I studied different documents and many live PROMs both from 2.30

arch/sparc/kernel/smp.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include <asm/tlbflush.h>

#include <asm/cpudata.h>



#include "irq.h"



int smp_num_cpus = 1;

volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,};

unsigned char boot_cpu_id = 0;