diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:48:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 08:48:56 -0700 |
| commit | 12829dcb10efc576c3739131a5d57fe7213632d9 (patch) | |
| tree | 8b3084f7b3172820e6e87a219fe018f8e235ad38 /arch/ppc64/kernel/nvram.c | |
| parent | c60e81ee1cac32dae1f9bf623dcb6b3b2bde8eab (diff) | |
| parent | 719d1cd86780c156f954fc34f34481adac197aec (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/nvram.c')
| -rw-r--r-- | arch/ppc64/kernel/nvram.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/nvram.c b/arch/ppc64/kernel/nvram.c index 4e71781a4414..4fb1a9f5060d 100644 --- a/arch/ppc64/kernel/nvram.c +++ b/arch/ppc64/kernel/nvram.c @@ -338,9 +338,8 @@ static int nvram_remove_os_partition(void) */ static int nvram_create_os_partition(void) { - struct list_head * p; - struct nvram_partition *part = NULL; - struct nvram_partition *new_part = NULL; + struct nvram_partition *part; + struct nvram_partition *new_part; struct nvram_partition *free_part = NULL; int seq_init[2] = { 0, 0 }; loff_t tmp_index; @@ -349,8 +348,7 @@ static int nvram_create_os_partition(void) /* Find a free partition that will give us the maximum needed size If can't find one that will give us the minimum size needed */ - list_for_each(p, &nvram_part->partition) { - part = list_entry(p, struct nvram_partition, partition); + list_for_each_entry(part, &nvram_part->partition, partition) { if (part->header.signature != NVRAM_SIG_FREE) continue; |