Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8343685 authored by Yoann Padioleau's avatar Yoann Padioleau Committed by Linus Torvalds
Browse files

parse errors in ifdefs 



Fix various bits of obviously-busted code which we're not happening to
compile, due to ifdefs.

Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 632155e6

Documentation/ia64/aliasing-test.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ skip: 
	return rc;

}



main()

int main()

{

	int rc;

arch/alpha/boot/tools/mkbb.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ typedef union __bootblock { 
#define	bootblock_label		__u1.__label

#define bootblock_checksum	__u2.__checksum



main(int argc, char ** argv)

int main(int argc, char ** argv)

{

    bootblock		bootblock_from_disk;

    bootblock		bootloader_image;

arch/arm/mm/alignment.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 


	fs = get_fs();

	set_fs(KERNEL_DS);

	if thumb_mode(regs) {

	if (thumb_mode(regs)) {

		fault = __get_user(tinstr, (u16 *)(instrptr & ~1));

		if (!(fault))

			instr = thumb2arm(tinstr);

arch/mips/jmr3927/rbhma3100/kgdb_io.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define TIMEOUT       0xffffff



static int remoteDebugInitialized = 0;

static void debugInit(int baud)

static void debugInit(int baud);



int putDebugChar(unsigned char c)

{

arch/mips/pci/pci-ocelot.c

+7 −7
Original line number Diff line number Diff line
@@ -71,19 +71,19 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data) 
}



static struct resource ocelot_mem_resource = {

	start	= GT_PCI_MEM_BASE;

	end	= GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;

	.start	= GT_PCI_MEM_BASE,

	.end	= GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1,

};



static struct resource ocelot_io_resource = {

	start	= GT_PCI_IO_BASE;

	end	= GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;

	.start	= GT_PCI_IO_BASE,

	.end	= GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1,

};



static struct pci_controller ocelot_pci_controller = {

	.pci_ops	= gt64xxx_pci0_ops;

	.mem_resource	= &ocelot_mem_resource;

	.io_resource	= &ocelot_io_resource;

	.pci_ops	= gt64xxx_pci0_ops,

	.mem_resource	= &ocelot_mem_resource,

	.io_resource	= &ocelot_io_resource,

};



static int __init ocelot_pcibios_init(void)