Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
Linus Torvalds 2006-07-05 21:08:35 -07:00
commit e2a305ecb5
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc64/kernel/prom.c
View file

@ -1032,7 +1032,9 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp)
static void irq_trans_init(struct device_node *dp) static void irq_trans_init(struct device_node *dp)
{ {
const char *model; const char *model;
#ifdef CONFIG_PCI
int i; int i;
#endif
model = of_get_property(dp, "model", NULL); model = of_get_property(dp, "model", NULL);
if (!model) if (!model)

10
arch/sparc64/kernel/sparc64_ksyms.c
View file

@ -124,11 +124,6 @@ EXPORT_SYMBOL(__write_lock);
EXPORT_SYMBOL(__write_unlock); EXPORT_SYMBOL(__write_unlock);
EXPORT_SYMBOL(__write_trylock); EXPORT_SYMBOL(__write_trylock);
#if defined(CONFIG_MCOUNT)
extern void _mcount(void);
EXPORT_SYMBOL(_mcount);
#endif
/* CPU online map and active count. */ /* CPU online map and active count. */
EXPORT_SYMBOL(cpu_online_map); EXPORT_SYMBOL(cpu_online_map);
EXPORT_SYMBOL(phys_cpu_present_map); EXPORT_SYMBOL(phys_cpu_present_map);
@ -136,6 +131,11 @@ EXPORT_SYMBOL(phys_cpu_present_map);
EXPORT_SYMBOL(smp_call_function); EXPORT_SYMBOL(smp_call_function);
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
#if defined(CONFIG_MCOUNT)
extern void _mcount(void);
EXPORT_SYMBOL(_mcount);
#endif
EXPORT_SYMBOL(sparc64_get_clock_tick); EXPORT_SYMBOL(sparc64_get_clock_tick);
/* semaphores */ /* semaphores */

5
arch/sparc64/kernel/time.c
View file

@ -788,12 +788,15 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
if (!regs) if (!regs)
return -ENOMEM; return -ENOMEM;
#ifdef CONFIG_PCI
if (!strcmp(model, "ds1287") || if (!strcmp(model, "ds1287") ||
!strcmp(model, "m5819") || !strcmp(model, "m5819") ||
!strcmp(model, "m5819p") || !strcmp(model, "m5819p") ||
!strcmp(model, "m5823")) { !strcmp(model, "m5823")) {
ds1287_regs = (unsigned long) regs; 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; mstk48t02_regs = regs;
} else if(model[5] == '0' && model[6] == '8') { } else if(model[5] == '0' && model[6] == '8') {
mstk48t08_regs = regs; mstk48t08_regs = regs;

14
include/asm-sparc64/dma-mapping.h
View file

@ -160,6 +160,20 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
BUG(); 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 */ #endif /* PCI */