git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc
/
kernel
/
pcic.c
diff --git
a/arch/sparc/kernel/pcic.c
b/arch/sparc/kernel/pcic.c
index
597d3ff
..
42002b7
100644
(file)
--- a/
arch/sparc/kernel/pcic.c
+++ b/
arch/sparc/kernel/pcic.c
@@
-143,7
+143,7
@@
static struct pcic_ca2irq pcic_i_jk[] = {
* as several PROMs may be installed on the same physical board.
*/
#define SN2L_INIT(name, map) \
* as several PROMs may be installed on the same physical board.
*/
#define SN2L_INIT(name, map) \
- { name, map,
sizeof(map)/sizeof(struct pcic_ca2irq
) }
+ { name, map,
ARRAY_SIZE(map
) }
static struct pcic_sn2list pcic_known_sysnames[] = {
SN2L_INIT("SUNW,JavaEngine1", pcic_i_je1a), /* JE1, PROM 2.32 */
static struct pcic_sn2list pcic_known_sysnames[] = {
SN2L_INIT("SUNW,JavaEngine1", pcic_i_je1a), /* JE1, PROM 2.32 */
@@
-161,7
+161,7
@@
static struct pcic_sn2list pcic_known_sysnames[] = {
static int pcic0_up;
static struct linux_pcic pcic0;
static int pcic0_up;
static struct linux_pcic pcic0;
-void
* __iomem
pcic_regs;
+void
__iomem *
pcic_regs;
volatile int pcic_speculative;
volatile int pcic_trapped;
volatile int pcic_speculative;
volatile int pcic_trapped;
@@
-497,8
+497,8
@@
static void pcic_map_pci_device(struct linux_pcic *pcic,
* CheerIO makes a similar conversion.
* See ebus.c for details.
*
* CheerIO makes a similar conversion.
* See ebus.c for details.
*
- * Note that
check_region()/
request_region()
- * work for these devices.
+ * Note that request_region()
+ * work
s
for these devices.
*
* XXX Neat trick, but it's a *bad* idea
* to shit into regions like that.
*
* XXX Neat trick, but it's a *bad* idea
* to shit into regions like that.
@@
-840,10
+840,7
@@
static int pci_do_settimeofday(struct timespec *tv)
xtime.tv_sec = tv->tv_sec;
xtime.tv_nsec = tv->tv_nsec;
xtime.tv_sec = tv->tv_sec;
xtime.tv_nsec = tv->tv_nsec;
- time_adjust = 0; /* stop active adjtime() */
- time_status |= STA_UNSYNC;
- time_maxerror = NTP_PHASE_LIMIT;
- time_esterror = NTP_PHASE_LIMIT;
+ ntp_clear();
return 0;
}
return 0;
}