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

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

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.
  [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
parents 66337dab 37e64e5a

arch/sparc64/kernel/prom.c

+2 −0
Original line number Diff line number Diff line
@@ -1032,7 +1032,9 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp) 
static void irq_trans_init(struct device_node *dp)

{

	const char *model;

#ifdef CONFIG_PCI

	int i;

#endif



	model = of_get_property(dp, "model", NULL);

	if (!model)

arch/sparc64/kernel/sparc64_ksyms.c

+5 −5
Original line number Diff line number Diff line
@@ -124,11 +124,6 @@ EXPORT_SYMBOL(__write_lock); 
EXPORT_SYMBOL(__write_unlock);

EXPORT_SYMBOL(__write_trylock);



#if defined(CONFIG_MCOUNT)

extern void _mcount(void);

EXPORT_SYMBOL(_mcount);

#endif



/* CPU online map and active count.  */

EXPORT_SYMBOL(cpu_online_map);

EXPORT_SYMBOL(phys_cpu_present_map);
@@ -136,6 +131,11 @@ EXPORT_SYMBOL(phys_cpu_present_map); 
EXPORT_SYMBOL(smp_call_function);

#endif /* CONFIG_SMP */



#if defined(CONFIG_MCOUNT)

extern void _mcount(void);

EXPORT_SYMBOL(_mcount);

#endif



EXPORT_SYMBOL(sparc64_get_clock_tick);



/* semaphores */

arch/sparc64/kernel/time.c

+4 −1
Original line number Diff line number Diff line
@@ -788,12 +788,15 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id 
	if (!regs)

		return -ENOMEM;



#ifdef CONFIG_PCI

	if (!strcmp(model, "ds1287") ||

	    !strcmp(model, "m5819") ||

	    !strcmp(model, "m5819p") ||

	    !strcmp(model, "m5823")) {

		ds1287_regs = (unsigned long) regs;

	} else if (model[5] == '0' && model[6] == '2') {

	} else

#endif

	if (model[5] == '0' && model[6] == '2') {

		mstk48t02_regs = regs;

	} else if(model[5] == '0' && model[6] == '8') {

		mstk48t08_regs = regs;

include/asm-sparc64/dma-mapping.h

+14 −0
Original line number Diff line number Diff line
@@ -160,6 +160,20 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
	BUG();

}



static inline void

dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,

			enum dma_data_direction direction)

{

	BUG();

}



static inline void

dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,

			   enum dma_data_direction direction)

{

	BUG();

}



#endif /* PCI */