diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-19 09:12:00 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-19 09:12:00 +0900 |
| commit | ee8365f23355cdb66e7a6c5c9364e8d3ba4de32f (patch) | |
| tree | e77b5ff0d17eb583312fe710de569081a3ec8f8d /arch/sh/include | |
| parent | 1b3edd9745ef3a9ee831fe5a611757686579c9e1 (diff) | |
| parent | e174d13010a6bd52045466bc35ca5a86e3f3ba9b (diff) | |
Merge branch 'master' into sh/cachetlb
Conflicts:
arch/sh/kernel/Makefile_64
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/dwarf.h | 4 | ||||
| -rw-r--r-- | arch/sh/include/asm/heartbeat.h | 1 | ||||
| -rw-r--r-- | arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/include/asm/dwarf.h b/arch/sh/include/asm/dwarf.h index 60b180728d8d..d3d3837c5e1b 100644 --- a/arch/sh/include/asm/dwarf.h +++ b/arch/sh/include/asm/dwarf.h @@ -340,6 +340,10 @@ struct dwarf_stack { #define DW_CFA_lo_user 0x1c #define DW_CFA_hi_user 0x3f +/* GNU extension opcodes */ +#define DW_CFA_GNU_args_size 0x2e +#define DW_CFA_GNU_negative_offset_extended 0x2f + /* * Some call frame instructions encode their operands in the opcode. We * need some helper functions to extract both the opcode and operands diff --git a/arch/sh/include/asm/heartbeat.h b/arch/sh/include/asm/heartbeat.h index 724a43ed245e..caaafe5a3ef1 100644 --- a/arch/sh/include/asm/heartbeat.h +++ b/arch/sh/include/asm/heartbeat.h @@ -11,6 +11,7 @@ struct heartbeat_data { unsigned int nr_bits; struct timer_list timer; unsigned int regsize; + unsigned int mask; unsigned long flags; }; diff --git a/arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt b/arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt index 9c85088728a7..25801d495c5f 100644 --- a/arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt +++ b/arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt @@ -24,6 +24,7 @@ LIST "setup clocks" ED 0xa4150004, 0x00000050 ED 0xa4150000, 0x91053508 WAIT 1 +ED 0xa4150050, 0x00000340 ED 0xa4150024, 0x00005000 LIST "setup pins" |