From 9006dbafe96d0619a7b6b4805a9ccae783cdb86c Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@parisc-linux.org>
Date: Mon, 4 Jun 2007 02:26:52 -0400
Subject: [PATCH] --- yaml --- r: 57763 b: refs/heads/master c:
 c3d4ed4e3e5aa8d9e6b4b795f004a7028ce780e9 h: refs/heads/master i:   57761:
 f9147878e7c2c99aa6966d012d06784cf8b03606   57759:
 327de45ffc9df6db9b042c3f6f5756fdac66bf1a v: v3

---
 [refs]                           | 2 +-
 trunk/arch/parisc/kernel/hpmc.S  | 5 +----
 trunk/arch/parisc/kernel/traps.c | 7 ++++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7cc6058fcd0c..10c424aeec34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bb457af4fa86dceef57d7c3e959aff162457fdc
+refs/heads/master: c3d4ed4e3e5aa8d9e6b4b795f004a7028ce780e9
diff --git a/trunk/arch/parisc/kernel/hpmc.S b/trunk/arch/parisc/kernel/hpmc.S
index d8baa158d8a0..43b41df0b541 100644
--- a/trunk/arch/parisc/kernel/hpmc.S
+++ b/trunk/arch/parisc/kernel/hpmc.S
@@ -295,8 +295,5 @@ os_hpmc_6:
 	b .
 	nop
 ENDPROC(os_hpmc)
-
-	/* this label used to compute os_hpmc checksum */
-ENTRY(os_hpmc_end)
-
+ENTRY(os_hpmc_end)	/* this label used to compute os_hpmc checksum */
 	nop
diff --git a/trunk/arch/parisc/kernel/traps.c b/trunk/arch/parisc/kernel/traps.c
index 0ba1d3dbca2a..c3ec9f1ec0f3 100644
--- a/trunk/arch/parisc/kernel/traps.c
+++ b/trunk/arch/parisc/kernel/traps.c
@@ -802,13 +802,14 @@ void handle_interruption(int code, struct pt_regs *regs)
 
 int __init check_ivt(void *iva)
 {
+	extern const u32 os_hpmc[];
+	extern const u32 os_hpmc_end[];
+
 	int i;
 	u32 check = 0;
 	u32 *ivap;
 	u32 *hpmcp;
 	u32 length;
-	extern void os_hpmc(void);
-	extern void os_hpmc_end(void);
 
 	if (strcmp((char *)iva, "cows can fly"))
 		return -1;
@@ -820,7 +821,7 @@ int __init check_ivt(void *iva)
 
 	/* Compute Checksum for HPMC handler */
 
-	length = (u32)((unsigned long)os_hpmc_end - (unsigned long)os_hpmc);
+	length = os_hpmc_end - os_hpmc;
 	ivap[7] = length;
 
 	hpmcp = (u32 *)os_hpmc;