sugar/linux
1
0
Fork 0
Code Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Convert INTC2 to IRQ table registration.
  sh: Updates for irq-flow-type naming changes.
  sh: Add some missing board headers.
  sh: Fix exception_handling_table alignment.
  sh: Cleanup board header directories.
  sh: Remove board-specific ide.h headers.
  sh: Proper show_stack/show_trace() implementation.
This commit is contained in:
Linus Torvalds
2006-10-23 07:50:00 -07:00
parent 5cfc35cf79 66a740572d
commit 2e11665c5e
46 changed files with 289 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
include/asm-sh/edosk7705/io.h → include/asm-sh/edosk7705.h
View File

0
include/asm-sh/hp6xx/hp6xx.h → include/asm-sh/hp6xx.h
View File

8
include/asm-sh/hp6xx/ide.h
View File

@@ -1,8 +0,0 @@
#ifndef __ASM_SH_HP6XX_IDE_H
#define __ASM_SH_HP6XX_IDE_H
#define IRQ_CFCARD 93
#define IRQ_PCMCIA 94
#endif /* __ASM_SH_HP6XX_IDE_H */

10
include/asm-sh/hp6xx/io.h
View File

@@ -1,10 +0,0 @@
#ifndef __ASM_SH_HP6XX_IO_H
#define __ASM_SH_HP6XX_IO_H
/*
* Nothing special here.. just use the generic cchip io routines.
*/
#include <asm/hd64461.h>
#endif /* __ASM_SH_HP6XX_IO_H */

0
include/asm-sh/hs7751rvoip/hs7751rvoip.h → include/asm-sh/hs7751rvoip.h
View File

8
include/asm-sh/hs7751rvoip/ide.h
View File

@@ -1,8 +0,0 @@
#ifndef __ASM_SH_HS7751RVOIP_IDE_H
#define __ASM_SH_HS7751RVOIP_IDE_H
/* Nothing to see here.. */
#include <asm/hs7751rvoip/hs7751rvoip.h>
#endif /* __ASM_SH_HS7751RVOIP_IDE_H */

10
include/asm-sh/irq-sh7780.h
View File

@@ -6,16 +6,6 @@
*
* Copyright (C) 2004 Takashi SHUDO <shudo@hitachi-ul.co.jp>
*/
#ifdef CONFIG_IDE
# ifndef IRQ_CFCARD
# define IRQ_CFCARD 14
# endif
# ifndef IRQ_PCMCIA
# define IRQ_PCMCIA 15
# endif
#endif
#define INTC_BASE 0xffd00000
#define INTC_ICR0 (INTC_BASE+0x0)
#define INTC_ICR1 (INTC_BASE+0x1c)

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

@@ -14,16 +14,6 @@
#include <asm/machvec.h>
#include <asm/ptrace.h> /* for pt_regs */
#if defined(CONFIG_SH_HP6XX) || \
defined(CONFIG_SH_RTS7751R2D) || \
defined(CONFIG_SH_HS7751RVOIP) || \
defined(CONFIG_SH_HS7751RVOIP) || \
defined(CONFIG_SH_SH03) || \
defined(CONFIG_SH_R7780RP) || \
defined(CONFIG_SH_LANDISK)
#include <asm/mach/ide.h>
#endif
#ifndef CONFIG_CPU_SUBTYPE_SH7780
#define INTC_DMAC0_MSK 0
@@ -38,15 +28,6 @@
#define INTC_IPRD 0xffd00010UL
#endif
#ifdef CONFIG_IDE
# ifndef IRQ_CFCARD
# define IRQ_CFCARD 14
# endif
# ifndef IRQ_PCMCIA
# define IRQ_PCMCIA 15
# endif
#endif
#define TIMER_IRQ 16
#define TIMER_IPR_ADDR INTC_IPRA
#define TIMER_IPR_POS 3
@@ -704,7 +685,7 @@ struct intc2_data {
unsigned char priority;
};
void make_intc2_irq(struct intc2_data *);
void make_intc2_irq(struct intc2_data *, unsigned int nr_irqs);
void init_IRQ_intc2(void);
#endif

14
include/asm-sh/landisk/ide.h
View File

@@ -1,14 +0,0 @@
/*
* modifed by kogiidena
* 2005.03.03
*/
#ifndef __ASM_SH_LANDISK_IDE_H
#define __ASM_SH_LANDISK_IDE_H
/* Nothing to see here.. */
#include <asm/landisk/iodata_landisk.h>
#define IRQ_CFCARD IRQ_FATA /* CF Card IRQ */
#define IRQ_PCMCIA IRQ_ATA /* PCMCIA IRQ */
#endif /* __ASM_SH_LANDISK_IDE_H */

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

@@ -255,6 +255,8 @@ extern void save_fpu(struct task_struct *__tsk, struct pt_regs *regs);
*/
#define thread_saved_pc(tsk) (tsk->thread.pc)
void show_trace(struct task_struct *tsk, unsigned long *sp,
struct pt_regs *regs);
extern unsigned long get_wchan(struct task_struct *p);
#define KSTK_EIP(tsk) ((tsk)->thread.pc)

6
include/asm-sh/r7780rp/r7780rp.h → include/asm-sh/r7780rp.h
View File

@@ -72,8 +72,6 @@
#define PA_AX88796L 0xa4100400 /* AX88796L Area */
#define PA_SC1602BSLB 0xa6000000 /* SC1602BSLB Area */
#define PA_AREA5_IO 0xb4000000 /* Area 5 IO Memory */
#define PA_AREA6_IO 0xb8000000 /* Area 6 IO Memory */
#define PA_IDE_OFFSET 0x1f0 /* CF IDE Offset */
#define AX88796L_IO_BASE 0x1000 /* AX88796L IO Base Address */
@@ -83,7 +81,6 @@
#define IRQ_PCISLOT2 66 /* PCI Slot #2 IRQ */
#define IRQ_PCISLOT3 67 /* PCI Slot #3 IRQ */
#define IRQ_PCISLOT4 68 /* PCI Slot #4 IRQ */
#define IRQ_CFCARD 1 /* CF Card IRQ */
// #define IRQ_CFINST 0 /* CF Card Insert IRQ */
#define IRQ_TP 2 /* Touch Panel IRQ */
#define IRQ_SCI1 3 /* SCI1 IRQ */
@@ -146,8 +143,6 @@
#define PA_AX88796L 0xa5800400 /* AX88796L Area */
#define PA_SC1602BSLB 0xa6000000 /* SC1602BSLB Area */
#define PA_AREA5_IO 0xb4000000 /* Area 5 IO Memory */
#define PA_AREA6_IO 0xb8000000 /* Area 6 IO Memory */
#define PA_IDE_OFFSET 0x1f0 /* CF IDE Offset */
#define AX88796L_IO_BASE 0x1000 /* AX88796L IO Base Address */
@@ -157,7 +152,6 @@
#define IRQ_PCISLOT2 1 /* PCI Slot #2 IRQ */
#define IRQ_PCISLOT3 2 /* PCI Slot #3 IRQ */
#define IRQ_PCISLOT4 3 /* PCI Slot #4 IRQ */
#define IRQ_CFCARD 4 /* CF Card IRQ */
#define IRQ_CFINST 5 /* CF Card Insert IRQ */
#define IRQ_M66596 6 /* M66596 IRQ */
#define IRQ_SDCARD 7 /* SD Card IRQ */

8
include/asm-sh/r7780rp/ide.h
View File

@@ -1,8 +0,0 @@
#ifndef __ASM_SH_R7780RP_IDE_H
#define __ASM_SH_R7780RP_IDE_H
/* Nothing to see here.. */
#include <asm/mach/r7780rp.h>
#endif /* __ASM_SH_R7780RP_IDE_H */

0
include/asm-sh/rts7751r2d/rts7751r2d.h → include/asm-sh/rts7751r2d.h
View File

8
include/asm-sh/rts7751r2d/ide.h
View File

@@ -1,8 +0,0 @@
#ifndef __ASM_SH_RTS7751R2D_IDE_H
#define __ASM_SH_RTS7751R2D_IDE_H
/* Nothing to see here.. */
#include <asm/rts7751r2d/rts7751r2d.h>
#endif /* __ASM_SH_RTS7751R2D_IDE_H */

7
include/asm-sh/sh03/ide.h
View File

@@ -1,7 +0,0 @@
#ifndef __ASM_SH_SH03_IDE_H
#define __ASM_SH_SH03_IDE_H
#define IRQ_CFCARD 8
#define IRQ_PCMCIA 8
#endif /* __ASM_SH_SH03_IDE_H */

0
include/asm-sh/shmin/shmin.h → include/asm-sh/shmin.h
View File

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

@@ -353,6 +353,13 @@ static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
(unsigned long)_n_, sizeof(*(ptr))); \
})
extern void *set_exception_table_vec(unsigned int vec, void *handler);
static inline void *set_exception_table_evt(unsigned int evt, void *handler)
{
return set_exception_table_vec(evt >> 5, handler);
}
/* XXX
* disable hlt during certain critical i/o operations
*/