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

Commit cd85b557 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Finally remove leftover markers sections
  m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
  m68k/mac: Fix compiler warning in via_read_time()
  zorro: Fix four checkpatch warnings
parents 04a87524 bc74ee97

arch/m68k/kernel/vmlinux.lds_no.S

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ SECTIONS { 


		*(.rodata) *(.rodata.*)

		*(__vermagic)		/* Kernel version magic */

		*(__markers_strings)

		*(.rodata1)

		*(.rodata.str1.1)

arch/m68k/mac/macints.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ int mac_irq_pending(unsigned int irq) 
		break;

	case 4:

		if (psc_present)

			psc_irq_pending(irq);

			return psc_irq_pending(irq);

		break;

	}

	return 0;

arch/m68k/mac/misc.c

+23 −17
Original line number Diff line number Diff line
@@ -307,32 +307,38 @@ static long via_read_time(void) 
		__u8 cdata[4];

		long idata;

	} result, last_result;

	int	ct;

	int count = 1;



	via_pram_command(0x81, &last_result.cdata[3]);

	via_pram_command(0x85, &last_result.cdata[2]);

	via_pram_command(0x89, &last_result.cdata[1]);

	via_pram_command(0x8D, &last_result.cdata[0]);



	/*

	 * The NetBSD guys say to loop until you get the same reading

	 * twice in a row.

	 */



	ct = 0;

	do {

		if (++ct > 10) {

			printk("via_read_time: couldn't get valid time, "

			       "last read = 0x%08lx and 0x%08lx\n",

			       last_result.idata, result.idata);

			break;

		}



		last_result.idata = result.idata;

		result.idata = 0;



	while (1) {

		via_pram_command(0x81, &result.cdata[3]);

		via_pram_command(0x85, &result.cdata[2]);

		via_pram_command(0x89, &result.cdata[1]);

		via_pram_command(0x8D, &result.cdata[0]);

	} while (result.idata != last_result.idata);



		if (result.idata == last_result.idata)

			return result.idata - RTC_OFFSET;



		if (++count > 10)

			break;



		last_result.idata = result.idata;

	}



	pr_err("via_read_time: failed to read a stable value; "

	       "got 0x%08lx then 0x%08lx\n",

	       last_result.idata, result.idata);



	return 0;

}



/*

drivers/zorro/zorro-driver.c

+4 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ zorro_match_device(const struct zorro_device_id *ids, 
	}

	return NULL;

}

EXPORT_SYMBOL(zorro_match_device);





static int zorro_device_probe(struct device *dev)
@@ -91,6 +92,7 @@ int zorro_register_driver(struct zorro_driver *drv) 
	/* register with core */

	return driver_register(&drv->driver);

}

EXPORT_SYMBOL(zorro_register_driver);





    /**
@@ -107,6 +109,7 @@ void zorro_unregister_driver(struct zorro_driver *drv) 
{

	driver_unregister(&drv->driver);

}

EXPORT_SYMBOL(zorro_unregister_driver);





    /**
@@ -168,6 +171,7 @@ struct bus_type zorro_bus_type = { 
	.probe	= zorro_device_probe,

	.remove	= zorro_device_remove,

};

EXPORT_SYMBOL(zorro_bus_type);





static int __init zorro_driver_init(void)
@@ -177,7 +181,3 @@ static int __init zorro_driver_init(void) 


postcore_initcall(zorro_driver_init);

EXPORT_SYMBOL(zorro_match_device);

EXPORT_SYMBOL(zorro_register_driver);

EXPORT_SYMBOL(zorro_unregister_driver);

EXPORT_SYMBOL(zorro_bus_type);

include/asm-generic/vmlinux.lds.h

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ 
		VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .;		\

		*(__tracepoints_ptrs)	/* Tracepoints: pointer array */\

		VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .;		\

		*(__markers_strings)	/* Markers: strings */		\

		*(__tracepoints_strings)/* Tracepoints: strings */	\

	}								\

									\