[PATCH] mm snapshot broken-out-2007-11-20-01-45 Build Failure arch/x86/kernel/pci-gart_64.c

[Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>]

Hi Andrew,

The kernel build fails, with foloowing message,

  CC      arch/x86/kernel/pci-gart_64.o
arch/x86/kernel/pci-gart_64.c: In function ‘gart_map_sg’:
arch/x86/kernel/pci-gart_64.c:421: error: redeclaration of ‘s’ with no linkage
arch/x86/kernel/pci-gart_64.c:416: error: previous declaration of ‘s’was here
arch/x86/kernel/pci-gart_64.c:421: error: redeclaration of ‘ps’ with no linkage
arch/x86/kernel/pci-gart_64.c:416: error: previous declaration of ‘ps’ was here
arch/x86/kernel/pci-gart_64.c:421: error: redeclaration of ‘start_sg’with no linkage
arch/x86/kernel/pci-gart_64.c:416: error: previous declaration of ‘start_sg’ was here
arch/x86/kernel/pci-gart_64.c:421: error: redeclaration of ‘sgmap’ with no linkage
arch/x86/kernel/pci-gart_64.c:416: error: previous declaration of ‘sgmap’ was here
make[1]: *** [arch/x86/kernel/pci-gart_64.o] Error 1
make: *** [arch/x86/kernel] Error 2

This is caused by the git-x86-fixup.patch.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--

--- linux-2.6.24-rc3/arch/x86/kernel/pci-gart_64.c	2007-11-21 00:16:23.000000000 +0530
+++ linux-2.6.24-rc3/arch/x86/kernel/~pci-gart_64.c	2007-11-21 04:02:12.000000000 +0530
@@ -418,7 +418,6 @@ gart_map_sg(struct device *dev, struct s
 	unsigned long pages = 0;
 	unsigned int seg_size;
 	unsigned int max_seg_size;
-	struct scatterlist *s, *ps, *start_sg, *sgmap;
 
 	if (nents == 0)
 		return 0;