[PATCH] export length of os_hpmc vector

[PATCH] export length of os_hpmc vector

[Kyle McMartin]

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 2cbf13b..5595a2f 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -80,6 +80,7 @@ END(hpmc_pim_data)
 
 	.import intr_save, code
 ENTRY(os_hpmc)
+.os_hpmc:
 
 	/*
 	 * registers modified:
@@ -295,5 +296,10 @@ os_hpmc_6:
 	b .
 	nop
 ENDPROC(os_hpmc)
-ENTRY(os_hpmc_end)	/* this label used to compute os_hpmc checksum */
+.os_hpmc_end:
 	nop
+.data
+.align 4
+	.export os_hpmc_size
+os_hpmc_size:
+	.word .os_hpmc_end-.os_hpmc
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 4c771cd..cbf4794 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -821,8 +852,8 @@ 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[];
+	extern u32 os_hpmc_size;
+	extern const u32 os_hpmc[];
 
 	int i;
 	u32 check = 0;
@@ -839,8 +870,7 @@ int __init check_ivt(void *iva)
 	    *ivap++ = 0;
 
 	/* Compute Checksum for HPMC handler */

Re: [PATCH] export length of os_hpmc vector

[Helge Deller]

Kyle McMartin wrote:
> diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
> index 2cbf13b..5595a2f 100644
> --- a/arch/parisc/kernel/hpmc.S
> +++ b/arch/parisc/kernel/hpmc.S
> @@ -80,6 +80,7 @@ END(hpmc_pim_data)
>  
>  	.import intr_save, code
>  ENTRY(os_hpmc)
> +.os_hpmc:

ENTRY(os_hpmc) already expands to
os_hpmc:

so you could

> +	.word .os_hpmc_end-.os_hpmc

change this to 
	.word .os_hpmc_end-os_hpmc
and drop the local label ".os_hpmc"

Helge

Re: [PATCH] export length of os_hpmc vector

[Kyle McMartin]

On Sat, Jan 03, 2009 at 10:24:33AM +0100, Helge Deller wrote:
> Kyle McMartin wrote:
> > diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
> > index 2cbf13b..5595a2f 100644
> > --- a/arch/parisc/kernel/hpmc.S
> > +++ b/arch/parisc/kernel/hpmc.S
> > @@ -80,6 +80,7 @@ END(hpmc_pim_data)
> >  
> >  	.import intr_save, code
> >  ENTRY(os_hpmc)
> > +.os_hpmc:
> 
> ENTRY(os_hpmc) already expands to
> os_hpmc:
> 
> so you could
> 
> > +	.word .os_hpmc_end-.os_hpmc
> 
> change this to 
> 	.word .os_hpmc_end-os_hpmc
> and drop the local label ".os_hpmc"
> 

In his previous mail JDA said to use local labels for safety...

Re: [PATCH] export length of os_hpmc vector

[John David Anglin]

> > change this to 
> > 	.word .os_hpmc_end-os_hpmc
> > and drop the local label ".os_hpmc"
> > 
> 
> In his previous mail JDA said to use local labels for safety...

The important thing is to ensure that the diff is an absolute value,
and that there's no relocation for the diff.

Diffs are tricky.  There may be a stub associated with os_hpmc.  I know
gdb sometimes gets confused between the stub and real entry point of
a function, and GCC always uses local labels in the exception and debug
tables.

Dave
-- 
J. David Anglin                                  dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada              (613) 990-0752 (FAX: 952-6602)