git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
hpmc.S
diff --git
a/arch/parisc/kernel/hpmc.S
b/arch/parisc/kernel/hpmc.S
index
2cbf13b
..
5595a2f
100644
(file)
--- 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)
.import intr_save, code
ENTRY(os_hpmc)
+.os_hpmc:
/*
* registers modified:
/*
* registers modified:
@@
-295,5
+296,10
@@
os_hpmc_6:
b .
nop
ENDPROC(os_hpmc)
b .
nop
ENDPROC(os_hpmc)
-ENTRY(os_hpmc_end) /* this label used to compute os_hpmc checksum */
+.os_hpmc_end:
nop
nop
+.data
+.align 4
+ .export os_hpmc_size
+os_hpmc_size:
+ .word .os_hpmc_end-.os_hpmc