Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0afc48b4
Commit
0afc48b4
authored
Feb 13, 2004
by
Benjamin Herrenschmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc64: Fix build of via-pmu driver on 64 bits kernel.
parent
02a9d5ff
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
drivers/macintosh/via-pmu.c
drivers/macintosh/via-pmu.c
+8
-2
No files found.
drivers/macintosh/via-pmu.c
View file @
0afc48b4
...
@@ -374,7 +374,9 @@ find_via_pmu(void)
...
@@ -374,7 +374,9 @@ find_via_pmu(void)
printk
(
KERN_INFO
"PMU driver %d initialized for %s, firmware: %02x
\n
"
,
printk
(
KERN_INFO
"PMU driver %d initialized for %s, firmware: %02x
\n
"
,
PMU_DRIVER_VERSION
,
pbook_type
[
pmu_kind
],
pmu_version
);
PMU_DRIVER_VERSION
,
pbook_type
[
pmu_kind
],
pmu_version
);
#ifndef CONFIG_PPC64
sys_ctrler
=
SYS_CTRLER_PMU
;
sys_ctrler
=
SYS_CTRLER_PMU
;
#endif
return
1
;
return
1
;
}
}
...
@@ -459,7 +461,9 @@ static int __init via_pmu_dev_init(void)
...
@@ -459,7 +461,9 @@ static int __init via_pmu_dev_init(void)
if
(
vias
==
NULL
)
if
(
vias
==
NULL
)
return
-
ENODEV
;
return
-
ENODEV
;
#ifndef CONFIG_PPC64
request_OF_resource
(
vias
,
0
,
NULL
);
request_OF_resource
(
vias
,
0
,
NULL
);
#endif
#ifdef CONFIG_PMAC_BACKLIGHT
#ifdef CONFIG_PMAC_BACKLIGHT
/* Enable backlight */
/* Enable backlight */
register_backlight_controller
(
&
pmu_backlight_controller
,
NULL
,
"pmu"
);
register_backlight_controller
(
&
pmu_backlight_controller
,
NULL
,
"pmu"
);
...
@@ -590,6 +594,7 @@ pmu_get_model(void)
...
@@ -590,6 +594,7 @@ pmu_get_model(void)
return
pmu_kind
;
return
pmu_kind
;
}
}
#ifndef CONFIG_PPC64
static
inline
void
wakeup_decrementer
(
void
)
static
inline
void
wakeup_decrementer
(
void
)
{
{
set_dec
(
tb_ticks_per_jiffy
);
set_dec
(
tb_ticks_per_jiffy
);
...
@@ -598,6 +603,7 @@ static inline void wakeup_decrementer(void)
...
@@ -598,6 +603,7 @@ static inline void wakeup_decrementer(void)
*/
*/
last_jiffy_stamp
(
0
)
=
tb_last_stamp
=
get_tbl
();
last_jiffy_stamp
(
0
)
=
tb_last_stamp
=
get_tbl
();
}
}
#endif
static
void
pmu_set_server_mode
(
int
server_mode
)
static
void
pmu_set_server_mode
(
int
server_mode
)
{
{
...
@@ -1389,7 +1395,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
...
@@ -1389,7 +1395,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
}
}
pmu_done
(
req
);
pmu_done
(
req
);
}
else
{
}
else
{
#if
def CONFIG_XMON
#if
defined(CONFIG_XMON) && !defined(CONFIG_PPC64)
if
(
len
==
4
&&
data
[
1
]
==
0x2c
)
{
if
(
len
==
4
&&
data
[
1
]
==
0x2c
)
{
extern
int
xmon_wants_key
,
xmon_adb_keycode
;
extern
int
xmon_wants_key
,
xmon_adb_keycode
;
if
(
xmon_wants_key
)
{
if
(
xmon_wants_key
)
{
...
@@ -1397,7 +1403,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
...
@@ -1397,7 +1403,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
return
;
return
;
}
}
}
}
#endif
/*
CONFIG_XMON
*/
#endif
/*
defined(CONFIG_XMON) && !defined(CONFIG_PPC64)
*/
#ifdef CONFIG_ADB
#ifdef CONFIG_ADB
/*
/*
* XXX On the [23]400 the PMU gives us an up
* XXX On the [23]400 the PMU gives us an up
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment