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
86d9fc12
Commit
86d9fc12
authored
16 years ago
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into release
parents
08dcf29e
8e92b660
33fd7afd
7642d211
5c9fcb5d
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
19 deletions
+33
-19
drivers/acpi/processor_idle.c
drivers/acpi/processor_idle.c
+5
-2
drivers/acpi/sbshc.c
drivers/acpi/sbshc.c
+0
-1
drivers/acpi/scan.c
drivers/acpi/scan.c
+12
-6
drivers/cpuidle/cpuidle.c
drivers/cpuidle/cpuidle.c
+2
-2
drivers/cpuidle/sysfs.c
drivers/cpuidle/sysfs.c
+8
-2
drivers/pnp/pnpacpi/rsparser.c
drivers/pnp/pnpacpi/rsparser.c
+4
-4
include/linux/cpuidle.h
include/linux/cpuidle.h
+2
-2
No files found.
drivers/acpi/processor_idle.c
View file @
86d9fc12
...
...
@@ -1487,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
return
0
;
}
acpi_unlazy_tlb
(
smp_processor_id
());
/*
* Must be done before busmaster disable as we might need to
* access HPET !
...
...
@@ -1577,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
return
0
;
}
acpi_unlazy_tlb
(
smp_processor_id
());
/* Tell the scheduler that we are going deep-idle: */
sched_clock_idle_sleep_event
();
/*
...
...
@@ -1692,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
switch
(
cx
->
type
)
{
case
ACPI_STATE_C1
:
state
->
flags
|=
CPUIDLE_FLAG_SHALLOW
;
state
->
flags
|=
CPUIDLE_FLAG_TIME_VALID
;
if
(
cx
->
entry_method
==
ACPI_CSTATE_FFH
)
state
->
flags
|=
CPUIDLE_FLAG_TIME_VALID
;
state
->
enter
=
acpi_idle_enter_c1
;
dev
->
safe_state
=
state
;
break
;
...
...
This diff is collapsed.
Click to expand it.
drivers/acpi/sbshc.c
View file @
86d9fc12
...
...
@@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
goto
end
;
}
smb_hc_write
(
hc
,
ACPI_SMB_COMMAND
,
command
);
smb_hc_write
(
hc
,
ACPI_SMB_COMMAND
,
command
);
if
(
!
(
protocol
&
0x01
))
{
smb_hc_write
(
hc
,
ACPI_SMB_BLOCK_COUNT
,
length
);
for
(
i
=
0
;
i
<
length
;
++
i
)
...
...
This diff is collapsed.
Click to expand it.
drivers/acpi/scan.c
View file @
86d9fc12
...
...
@@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
int
size
)
{
int
len
;
int
count
;
if
(
!
acpi_dev
->
flags
.
hardware_id
)
if
(
!
acpi_dev
->
flags
.
hardware_id
&&
!
acpi_dev
->
flags
.
compatible_ids
)
return
-
ENODEV
;
len
=
snprintf
(
modalias
,
size
,
"acpi:%s:"
,
acpi_dev
->
pnp
.
hardware_id
);
if
(
len
<
0
||
len
>=
size
)
return
-
EINVAL
;
len
=
snprintf
(
modalias
,
size
,
"acpi:"
);
size
-=
len
;
if
(
acpi_dev
->
flags
.
hardware_id
)
{
count
=
snprintf
(
&
modalias
[
len
],
size
,
"%s:"
,
acpi_dev
->
pnp
.
hardware_id
);
if
(
count
<
0
||
count
>=
size
)
return
-
EINVAL
;
len
+=
count
;
size
-=
count
;
}
if
(
acpi_dev
->
flags
.
compatible_ids
)
{
struct
acpi_compatible_id_list
*
cid_list
;
int
i
;
int
count
;
cid_list
=
acpi_dev
->
pnp
.
cid_list
;
for
(
i
=
0
;
i
<
cid_list
->
count
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
drivers/cpuidle/cpuidle.c
View file @
86d9fc12
...
...
@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void)
/* enter the state and update stats */
dev
->
last_residency
=
target_state
->
enter
(
dev
,
target_state
);
dev
->
last_state
=
target_state
;
target_state
->
time
+=
dev
->
last_residency
;
target_state
->
time
+=
(
unsigned
long
long
)
dev
->
last_residency
;
target_state
->
usage
++
;
/* give the governor an opportunity to reflect on the outcome */
...
...
@@ -224,7 +224,7 @@ static void poll_idle_init(struct cpuidle_device *dev)
state
->
exit_latency
=
0
;
state
->
target_residency
=
0
;
state
->
power_usage
=
-
1
;
state
->
flags
=
CPUIDLE_FLAG_POLL
|
CPUIDLE_FLAG_TIME_VALID
;
state
->
flags
=
CPUIDLE_FLAG_POLL
;
state
->
enter
=
poll_idle
;
}
#else
...
...
This diff is collapsed.
Click to expand it.
drivers/cpuidle/sysfs.c
View file @
86d9fc12
...
...
@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
return sprintf(buf, "%u\n", state->_name);\
}
#define define_show_state_ull_function(_name) \
static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
{ \
return sprintf(buf, "%llu\n", state->_name);\
}
#define define_show_state_str_function(_name) \
static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
{ \
...
...
@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
define_show_state_function
(
exit_latency
)
define_show_state_function
(
power_usage
)
define_show_state_function
(
usage
)
define_show_state_function
(
time
)
define_show_state_
ull_
function
(
usage
)
define_show_state_
ull_
function
(
time
)
define_show_state_str_function
(
name
)
define_show_state_str_function
(
desc
)
...
...
This diff is collapsed.
Click to expand it.
drivers/pnp/pnpacpi/rsparser.c
View file @
86d9fc12
...
...
@@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
i
<
PNP_MAX_IRQ
)
i
++
;
if
(
i
>=
PNP_MAX_IRQ
&&
!
warned
)
{
printk
(
KERN_
ERR
"pnpacpi: exceeded the max number of IRQ "
printk
(
KERN_
WARNING
"pnpacpi: exceeded the max number of IRQ "
"resources: %d
\n
"
,
PNP_MAX_IRQ
);
warned
=
1
;
return
;
...
...
@@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
res
->
dma_resource
[
i
].
start
=
dma
;
res
->
dma_resource
[
i
].
end
=
dma
;
}
else
if
(
!
warned
)
{
printk
(
KERN_
ERR
"pnpacpi: exceeded the max number of DMA "
printk
(
KERN_
WARNING
"pnpacpi: exceeded the max number of DMA "
"resources: %d
\n
"
,
PNP_MAX_DMA
);
warned
=
1
;
}
...
...
@@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
res
->
port_resource
[
i
].
start
=
io
;
res
->
port_resource
[
i
].
end
=
io
+
len
-
1
;
}
else
if
(
!
warned
)
{
printk
(
KERN_
ERR
"pnpacpi: exceeded the max number of IO "
printk
(
KERN_
WARNING
"pnpacpi: exceeded the max number of IO "
"resources: %d
\n
"
,
PNP_MAX_PORT
);
warned
=
1
;
}
...
...
@@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
res
->
mem_resource
[
i
].
start
=
mem
;
res
->
mem_resource
[
i
].
end
=
mem
+
len
-
1
;
}
else
if
(
!
warned
)
{
printk
(
KERN_
ERR
"pnpacpi: exceeded the max number of mem "
printk
(
KERN_
WARNING
"pnpacpi: exceeded the max number of mem "
"resources: %d
\n
"
,
PNP_MAX_MEM
);
warned
=
1
;
}
...
...
This diff is collapsed.
Click to expand it.
include/linux/cpuidle.h
View file @
86d9fc12
...
...
@@ -38,8 +38,8 @@ struct cpuidle_state {
unsigned
int
power_usage
;
/* in mW */
unsigned
int
target_residency
;
/* in US */
unsigned
int
usage
;
unsigned
int
time
;
/* in US */
unsigned
long
long
usage
;
unsigned
long
long
time
;
/* in US */
int
(
*
enter
)
(
struct
cpuidle_device
*
dev
,
struct
cpuidle_state
*
state
);
...
...
This diff is collapsed.
Click to expand it.
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