git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
parisc
/
kernel
/
inventory.c
diff --git
a/arch/parisc/kernel/inventory.c
b/arch/parisc/kernel/inventory.c
index
1a1c664
..
4e847ba
100644
(file)
--- a/
arch/parisc/kernel/inventory.c
+++ b/
arch/parisc/kernel/inventory.c
@@
-38,7
+38,7
@@
*/
#undef DEBUG_PAT
*/
#undef DEBUG_PAT
-int pdc_type = PDC_TYPE_ILLEGAL;
+int pdc_type
__read_mostly
= PDC_TYPE_ILLEGAL;
void __init setup_pdc(void)
{
void __init setup_pdc(void)
{
@@
-120,8
+120,8
@@
set_pmem_entry(physmem_range_t *pmem_ptr, unsigned long start,
* pdc info is bad in this case).
*/
* pdc info is bad in this case).
*/
- if (
((start & (PAGE_SIZE - 1)) != 0)
- || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) ) {
+ if (
unlikely(
((start & (PAGE_SIZE - 1)) != 0)
+ || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) )
)
{
panic("Memory range doesn't align with page size!\n");
}
panic("Memory range doesn't align with page size!\n");
}
@@
-188,7
+188,7
@@
pat_query_module(ulong pcell_loc, ulong mod_index)
temp = pa_pdc_cell.cba;
dev = alloc_pa_dev(PAT_GET_CBA(temp), &pa_pdc_cell.mod_path);
if (!dev) {
temp = pa_pdc_cell.cba;
dev = alloc_pa_dev(PAT_GET_CBA(temp), &pa_pdc_cell.mod_path);
if (!dev) {
- return PDC_
NE_MOD
;
+ return PDC_
OK
;
}
/* alloc_pa_dev sets dev->hpa */
}
/* alloc_pa_dev sets dev->hpa */