From: Andrew Morton gcc-2.95.x can't do .foo.bar = N. (Actually, all those initialisations-to-zero could just be removed.) - Whitespace fixes - Unneeded init-to-zero. Cc: Paul Jackson Signed-off-by: Andrew Morton --- include/linux/cpuset.h | 6 +++--- kernel/cpuset.c | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff -puN kernel/cpuset.c~cpuset-memory-pressure-meter-gcc-295-fix kernel/cpuset.c --- devel/kernel/cpuset.c~cpuset-memory-pressure-meter-gcc-295-fix 2005-11-05 00:56:02.000000000 -0800 +++ devel-akpm/kernel/cpuset.c 2005-11-05 00:56:02.000000000 -0800 @@ -185,9 +185,11 @@ static struct cpuset top_cpuset = { .cpus_allowed = CPU_MASK_ALL, .mems_allowed = NODE_MASK_ALL, .marker_pid = 0, - .fmeter.cnt = 0, - .fmeter.val = 0, - .fmeter.time = 0, + .fmeter = { + .cnt = 0, + .val = 0, + .time = 0, + }, .count = ATOMIC_INIT(0), .sibling = LIST_HEAD_INIT(top_cpuset.sibling), .children = LIST_HEAD_INIT(top_cpuset.children), @@ -197,7 +199,7 @@ static struct cpuset top_cpuset = { }; static struct vfsmount *cpuset_mount; -static struct super_block *cpuset_sb = NULL; +static struct super_block *cpuset_sb; /* * We have two global cpuset semaphores below. They can nest. diff -puN include/linux/cpuset.h~cpuset-memory-pressure-meter-gcc-295-fix include/linux/cpuset.h --- devel/include/linux/cpuset.h~cpuset-memory-pressure-meter-gcc-295-fix 2005-11-05 00:56:02.000000000 -0800 +++ devel-akpm/include/linux/cpuset.h 2005-11-05 00:56:02.000000000 -0800 @@ -27,9 +27,9 @@ int cpuset_zonelist_valid_mems_allowed(s extern int cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask); extern int cpuset_excl_nodes_overlap(const struct task_struct *p); -#define cpuset_memory_pressure_bump() \ - do { \ - if (cpuset_memory_pressure_enabled) \ +#define cpuset_memory_pressure_bump() \ + do { \ + if (cpuset_memory_pressure_enabled) \ __cpuset_memory_pressure_bump(); \ } while (0) extern int cpuset_memory_pressure_enabled; _