Merge branch 'master' into sh/cachetlb

Conflicts:
	arch/sh/kernel/Makefile_64

2 files changed, 5 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;
 };