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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
pSeries_nvram.c
diff --git
a/arch/ppc64/kernel/pSeries_nvram.c
b/arch/ppc64/kernel/pSeries_nvram.c
index
ebccb16
..
5d74028
100644
(file)
--- a/
arch/ppc64/kernel/pSeries_nvram.c
+++ b/
arch/ppc64/kernel/pSeries_nvram.c
@@
-37,7
+37,8
@@
static spinlock_t nvram_lock = SPIN_LOCK_UNLOCKED;
static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
{
unsigned int i;
static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
{
unsigned int i;
- unsigned long len, done;
+ unsigned long len;
+ int done;
unsigned long flags;
char *p = buf;
unsigned long flags;
char *p = buf;
@@
-80,7
+81,8
@@
static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
static ssize_t pSeries_nvram_write(char *buf, size_t count, loff_t *index)
{
unsigned int i;
static ssize_t pSeries_nvram_write(char *buf, size_t count, loff_t *index)
{
unsigned int i;
- unsigned long len, done;
+ unsigned long len;
+ int done;
unsigned long flags;
const char *p = buf;
unsigned long flags;
const char *p = buf;