lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: More cosmetic cleanups and trivial fixes.

Browse Source 
Nothing exciting here, just trivial fixes..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2006-09-27 17:03:56 +09:00
parent 9e3043c091
commit 0f08f33808
11 changed files with 35 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asm-sh/dma.h
View File

@@ -89,6 +89,7 @@ struct dma_channel {
wait_queue_head_t wait_queue;
struct sys_device dev;
char *name;
};
struct dma_info {

5
include/asm-sh/irq.h
View File

@@ -334,6 +334,11 @@ extern void enable_irq(unsigned int);
extern void make_maskreg_irq(unsigned int irq);
extern unsigned short *irq_mask_register;
/*
* PINT IRQs
*/
void init_IRQ_pint(void);
/*
* Function for "on chip support modules".
*/

2
include/asm-sh/kexec.h
View File

@@ -23,6 +23,8 @@
/* The native architecture */
#define KEXEC_ARCH KEXEC_ARCH_SH
#define MAX_NOTE_BYTES 1024
#ifndef __ASSEMBLY__
extern void machine_shutdown(void);

36
include/asm-sh/system.h
View File

@@ -79,7 +79,7 @@ static inline void sched_cacheflush(void)
}
#endif
static __inline__ unsigned long tas(volatile int *m)
static inline unsigned long tas(volatile int *m)
{
unsigned long retval;
@@ -161,7 +161,7 @@ static inline void local_irq_enable(void)
}
#endif
static __inline__ void local_irq_disable(void)
static inline void local_irq_disable(void)
{
unsigned long __dummy;
__asm__ __volatile__("stc sr, %0\n\t"
@@ -172,7 +172,7 @@ static __inline__ void local_irq_disable(void)
: "memory");
}
static __inline__ void set_bl_bit(void)
static inline void set_bl_bit(void)
{
unsigned long __dummy0, __dummy1;
@@ -185,7 +185,7 @@ static __inline__ void set_bl_bit(void)
: "memory");
}
static __inline__ void clear_bl_bit(void)
static inline void clear_bl_bit(void)
{
unsigned long __dummy0, __dummy1;
@@ -207,7 +207,7 @@ static __inline__ void clear_bl_bit(void)
(flags != 0); \
})
static __inline__ unsigned long local_irq_save(void)
static inline unsigned long local_irq_save(void)
{
unsigned long flags, __dummy;
@@ -223,36 +223,10 @@ static __inline__ unsigned long local_irq_save(void)
return flags;
}
#ifdef DEBUG_CLI_STI
static __inline__ void local_irq_restore(unsigned long x)
{
if ((x & 0x000000f0) != 0x000000f0)
local_irq_enable();
else {
unsigned long flags;
local_save_flags(flags);
if (flags == 0) {
extern void dump_stack(void);
printk(KERN_ERR "BUG!\n");
dump_stack();
local_irq_disable();
}
}
}
#else
#define local_irq_restore(x) do { \
if ((x & 0x000000f0) != 0x000000f0) \
local_irq_enable(); \
} while (0)
#endif
#define really_restore_flags(x) do { \
if ((x & 0x000000f0) != 0x000000f0) \
local_irq_enable(); \
else \
local_irq_disable(); \
} while (0)
/*
* Jump to P2 area.