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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits)
  [SPARC64]: virt_to_real_irq_table --> virt_irq_table
  [SPARC64]: virt_irq --> bucket mapping no longer necessary
  [SPARC64]: Kill ugly __bucket() macro.
  [SPARC64]: Kill ugly __irq_ino() macro.
  [SPARC64]: Only use bypass accesses to INO buckets.
  [SPARC64]: Update defconfig.
  [SPARC64]: Use sun4v VIRQ interfaces as intended.
  [SPARC64]: Allocate ivector_table dynamically.
  [SPARC64]: Access ivector_table[] using physical addresses.
  [SPARC64]: Make IVEC pointers 64-bit.
  [SPARC64]: Fix register usage in xor_raid_4().
  [SPARC64]: Kill pci_memspace_mask.
  [SPARC64]: Consolidate MSI support code.
  [SPARC/64]: Move of_platform_driver initialisations: arch/sparc{,64}.
  [SPARC64]: Fix bugs in SYSV IPC handling in 64-bit processes.
  [SPARC/64]: Prepare to remove of_platform_driver name.
  [SPARC32]: Add irqflags.h to sparc32 and use it from generic code.
  [SPARC64]: beautify vmlinux.lds
  [SPARC]: beautify vmlinux.lds
  [SPARC64]: Enable MSI on sun4u Fire PCI-E controllers.
  ...
parents 5dd80d5d 45b3f4cc

Documentation/sparc/sbus_drivers.txt

+3 −1
Original line number Diff line number Diff line
@@ -67,10 +67,12 @@ probe in an SBUS driver under Linux: 
	MODULE_DEVICE_TABLE(of, mydevice_match);



	static struct of_platform_driver mydevice_driver = {

		.name		= "mydevice",

		.match_table	= mydevice_match,

		.probe		= mydevice_probe,

		.remove		= __devexit_p(mydevice_remove),

		.driver		= {

			.name		= "mydevice",

		},

	};



	static int __init mydevice_init(void)

arch/sparc/Kconfig.debug

+4 −0
Original line number Diff line number Diff line 
menu "Kernel hacking"



config TRACE_IRQFLAGS_SUPPORT

	bool

	default y



source "lib/Kconfig.debug"



config DEBUG_STACK_USAGE

arch/sparc/kernel/irq.c

+6 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
#define SMP_NOP2

#define SMP_NOP3

#endif /* SMP */

unsigned long __local_irq_save(void)

unsigned long __raw_local_irq_save(void)

{

	unsigned long retval;

	unsigned long tmp;
@@ -74,7 +74,7 @@ unsigned long __local_irq_save(void) 
	return retval;

}



void local_irq_enable(void)

void raw_local_irq_enable(void)

{

	unsigned long tmp;
@@ -89,7 +89,7 @@ void local_irq_enable(void) 
		: "memory");

}



void local_irq_restore(unsigned long old_psr)

void raw_local_irq_restore(unsigned long old_psr)

{

	unsigned long tmp;
@@ -105,9 +105,9 @@ void local_irq_restore(unsigned long old_psr) 
		: "memory");

}



EXPORT_SYMBOL(__local_irq_save);

EXPORT_SYMBOL(local_irq_enable);

EXPORT_SYMBOL(local_irq_restore);

EXPORT_SYMBOL(__raw_local_irq_save);

EXPORT_SYMBOL(raw_local_irq_enable);

EXPORT_SYMBOL(raw_local_irq_restore);



/*

 * Dave Redman (djhr@tadpole.co.uk)

arch/sparc/kernel/of_device.c

+4 −1
Original line number Diff line number Diff line
@@ -588,7 +588,10 @@ __setup("of_debug=", of_debug); 
int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)

{

	/* initialize common driver fields */

	if (!drv->driver.name)

		drv->driver.name = drv->name;

	if (!drv->driver.owner)

		drv->driver.owner = drv->owner;

	drv->driver.bus = bus;



	/* register with core */

arch/sparc/kernel/time.c

+3 −1
Original line number Diff line number Diff line
@@ -347,9 +347,11 @@ static struct of_device_id clock_match[] = { 
};



static struct of_platform_driver clock_driver = {

	.name		= "clock",

	.match_table	= clock_match,

	.probe		= clock_probe,

	.driver		= {

		.name	= "clock",

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE