Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git (cf025109) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/sparc/kernel/process.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,17 @@ void show_stack(struct task_struct tsk, unsigned long _ksp)
		printk("\n");
		}

		void dump_stack(void)
		{
		unsigned long *ksp;

		__asm__ __volatile__("mov %%fp, %0"
		: "=r" (ksp));
		show_stack(current, ksp);
		}

		EXPORT_SYMBOL(dump_stack);

		/*
		* Note: sparc64 has a pretty intricated thread_saved_pc, check it out.
		*/

arch/sparc/kernel/sparc_ksyms.c

+17 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/in6.h>
		#include <linux/spinlock.h>
		#include <linux/mm.h>
		#include <linux/syscalls.h>
		#ifdef CONFIG_PCI
		#include <linux/pci.h>
		#endif
		@@ -89,6 +90,9 @@ extern void ___atomic24_sub(void);
		extern void ___set_bit(void);
		extern void ___clear_bit(void);
		extern void ___change_bit(void);
		extern void ___rw_read_enter(void);
		extern void ___rw_read_exit(void);
		extern void ___rw_write_enter(void);

		/* Alias functions whose names begin with "." and export the aliases.
		* The module references will be fixed up by module_frob_arch_sections.
		@@ -121,9 +125,9 @@ EXPORT_SYMBOL(_do_write_unlock);
		#endif
		#else
		// XXX find what uses (or used) these.
		// EXPORT_SYMBOL_PRIVATE(_rw_read_enter);
		// EXPORT_SYMBOL_PRIVATE(_rw_read_exit);
		// EXPORT_SYMBOL_PRIVATE(_rw_write_enter);
		EXPORT_SYMBOL(___rw_read_enter);
		EXPORT_SYMBOL(___rw_read_exit);
		EXPORT_SYMBOL(___rw_write_enter);
		#endif
		/* semaphores */
		EXPORT_SYMBOL(__up);
		@@ -144,6 +148,9 @@ EXPORT_SYMBOL(___set_bit);
		EXPORT_SYMBOL(___clear_bit);
		EXPORT_SYMBOL(___change_bit);

		/* Per-CPU information table */
		EXPORT_PER_CPU_SYMBOL(__cpu_data);

		#ifdef CONFIG_SMP
		/* IRQ implementation. */
		EXPORT_SYMBOL(synchronize_irq);
		@@ -151,6 +158,10 @@ EXPORT_SYMBOL(synchronize_irq);
		/* Misc SMP information */
		EXPORT_SYMBOL(__cpu_number_map);
		EXPORT_SYMBOL(__cpu_logical_map);

		/* CPU online map and active count. */
		EXPORT_SYMBOL(cpu_online_map);
		EXPORT_SYMBOL(phys_cpu_present_map);
		#endif

		EXPORT_SYMBOL(__udelay);
		@@ -332,3 +343,6 @@ EXPORT_SYMBOL(do_BUG);

		/* Sun Power Management Idle Handler */
		EXPORT_SYMBOL(pm_idle);

		/* Binfmt_misc needs this */
		EXPORT_SYMBOL(sys_close);

drivers/net/sunbmac.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,18 @@

		#include "sunbmac.h"

		#define DRV_NAME "sunbmac"
		#define DRV_VERSION "2.0"
		#define DRV_RELDATE "11/24/03"
		#define DRV_AUTHOR "David S. Miller (davem@redhat.com)"

		static char version[] __initdata =
		"sunbmac.c:v2.0 24/Nov/03 David S. Miller (davem@redhat.com)\n";
		DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";

		MODULE_VERSION(DRV_VERSION);
		MODULE_AUTHOR(DRV_AUTHOR);
		MODULE_DESCRIPTION("Sun BigMAC 100baseT ethernet driver");
		MODULE_LICENSE("GPL");

		#undef DEBUG_PROBE
		#undef DEBUG_TX
		@@ -1321,4 +1331,3 @@ static void __exit bigmac_cleanup(void)

		module_init(bigmac_probe);
		module_exit(bigmac_cleanup);
		MODULE_LICENSE("GPL");

drivers/net/sunhme.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -13,9 +13,6 @@
		* argument : macaddr=0x00,0x10,0x20,0x30,0x40,0x50
		*/

		static char version[] =
		"sunhme.c:v2.02 24/Aug/2003 David S. Miller (davem@redhat.com)\n";

		#include <linux/config.h>
		#include <linux/module.h>
		#include <linux/kernel.h>
		@@ -67,15 +64,24 @@ static char version[] =

		#include "sunhme.h"


		#define DRV_NAME "sunhme"
		#define DRV_VERSION "2.02"
		#define DRV_RELDATE "8/24/03"
		#define DRV_AUTHOR "David S. Miller (davem@redhat.com)"

		static char version[] =
		DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";

		MODULE_VERSION(DRV_VERSION);
		MODULE_AUTHOR(DRV_AUTHOR);
		MODULE_DESCRIPTION("Sun HappyMealEthernet(HME) 10/100baseT ethernet driver");
		MODULE_LICENSE("GPL");

		static int macaddr[6];

		/* accept MAC address of the form macaddr=0x08,0x00,0x20,0x30,0x40,0x50 */
		module_param_array(macaddr, int, NULL, 0);
		MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set");
		MODULE_LICENSE("GPL");

		static struct happy_meal *root_happy_dev;

drivers/net/sunlance.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -69,9 +69,6 @@

		#undef DEBUG_DRIVER

		static char version[] =
		"sunlance.c:v2.02 24/Aug/03 Miguel de Icaza (miguel@nuclecu.unam.mx)\n";

		static char lancestr[] = "LANCE";

		#include <linux/config.h>
		@@ -108,6 +105,19 @@ static char lancestr[] = "LANCE";
		#include <asm/auxio.h> /* For tpe-link-test? setting */
		#include <asm/irq.h>

		#define DRV_NAME "sunlance"
		#define DRV_VERSION "2.02"
		#define DRV_RELDATE "8/24/03"
		#define DRV_AUTHOR "Miguel de Icaza (miguel@nuclecu.unam.mx)"

		static char version[] =
		DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";

		MODULE_VERSION(DRV_VERSION);
		MODULE_AUTHOR(DRV_AUTHOR);
		MODULE_DESCRIPTION("Sun Lance ethernet driver");
		MODULE_LICENSE("GPL");

		/* Define: 2^4 Tx buffers and 2^4 Rx buffers */
		#ifndef LANCE_LOG_TX_BUFFERS
		#define LANCE_LOG_TX_BUFFERS 4
		@@ -1611,4 +1621,3 @@ static void __exit sparc_lance_cleanup(void)

		module_init(sparc_lance_probe);
		module_exit(sparc_lance_cleanup);
		MODULE_LICENSE("GPL");