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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
rtas.c
diff --git
a/arch/ppc64/kernel/rtas.c
b/arch/ppc64/kernel/rtas.c
index
b199fec
..
f719d9c
100644
(file)
--- a/
arch/ppc64/kernel/rtas.c
+++ b/
arch/ppc64/kernel/rtas.c
@@
-31,7
+31,7
@@
#include <asm/delay.h>
#include <asm/uaccess.h>
#include <asm/delay.h>
#include <asm/uaccess.h>
-struct flash_block_list_header rtas_firmware_flash_list = {0,
NULL
};
+struct flash_block_list_header rtas_firmware_flash_list = {0,
0
};
struct rtas_t rtas = {
.lock = SPIN_LOCK_UNLOCKED
struct rtas_t rtas = {
.lock = SPIN_LOCK_UNLOCKED
@@
-331,7
+331,7
@@
rtas_flash_firmware(void)
if (f->next)
f->next = (struct flash_block_list *)virt_to_abs(f->next);
else
if (f->next)
f->next = (struct flash_block_list *)virt_to_abs(f->next);
else
- f->next =
NU
LL;
+ f->next =
0
LL;
/* make num_blocks into the version/length field */
f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16);
}
/* make num_blocks into the version/length field */
f->num_blocks = (FLASH_BLOCK_LIST_VERSION << 56) | ((f->num_blocks+1)*16);
}
@@
-502,7
+502,7
@@
void rtas_stop_self(void)
BUG_ON(rtas_args->token == RTAS_UNKNOWN_SERVICE);
BUG_ON(rtas_args->token == RTAS_UNKNOWN_SERVICE);
- printk("
cpu %u (hwid %u)
Ready to die...\n",
+ printk("
%u %u
Ready to die...\n",
smp_processor_id(), hard_smp_processor_id());
enter_rtas(__pa(rtas_args));
smp_processor_id(), hard_smp_processor_id());
enter_rtas(__pa(rtas_args));