Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+25
-6
+2
arch/sparc64/kernel/prom.c
+2
arch/sparc64/kernel/prom.c
+5
-5
arch/sparc64/kernel/sparc64_ksyms.c
+5
-5
arch/sparc64/kernel/sparc64_ksyms.c
···
124
124
EXPORT_SYMBOL(__write_unlock);
125
125
EXPORT_SYMBOL(__write_trylock);
126
126
127
-
#if defined(CONFIG_MCOUNT)
128
-
extern void _mcount(void);
129
-
EXPORT_SYMBOL(_mcount);
130
-
#endif
131
-
132
127
/* CPU online map and active count. */
133
128
EXPORT_SYMBOL(cpu_online_map);
134
129
EXPORT_SYMBOL(phys_cpu_present_map);
135
130
136
131
EXPORT_SYMBOL(smp_call_function);
137
132
#endif /* CONFIG_SMP */
133
+
134
+
#if defined(CONFIG_MCOUNT)
135
+
extern void _mcount(void);
136
+
EXPORT_SYMBOL(_mcount);
137
+
#endif
138
138
139
139
EXPORT_SYMBOL(sparc64_get_clock_tick);
140
140
+4
-1
arch/sparc64/kernel/time.c
+4
-1
arch/sparc64/kernel/time.c
···
788
788
if (!regs)
789
789
return -ENOMEM;
790
790
791
+
#ifdef CONFIG_PCI
791
792
if (!strcmp(model, "ds1287") ||
792
793
!strcmp(model, "m5819") ||
793
794
!strcmp(model, "m5819p") ||
794
795
!strcmp(model, "m5823")) {
795
796
ds1287_regs = (unsigned long) regs;
796
-
} else if (model[5] == '0' && model[6] == '2') {
797
+
} else
798
+
#endif
799
+
if (model[5] == '0' && model[6] == '2') {
797
800
mstk48t02_regs = regs;
798
801
} else if(model[5] == '0' && model[6] == '8') {
799
802
mstk48t08_regs = regs;
+14
include/asm-sparc64/dma-mapping.h
+14
include/asm-sparc64/dma-mapping.h
···
160
160
BUG();
161
161
}
162
162
163
+
static inline void
164
+
dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
165
+
enum dma_data_direction direction)
166
+
{
167
+
BUG();
168
+
}
169
+
170
+
static inline void
171
+
dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
172
+
enum dma_data_direction direction)
173
+
{
174
+
BUG();
175
+
}
176
+
163
177
#endif /* PCI */
164
178
165
179