projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm-current/current'
[deliverable/linux.git]
/
arch
/
x86
/
kernel
/
process.c
diff --git
a/arch/x86/kernel/process.c
b/arch/x86/kernel/process.c
index c1fa790c81cd51a0cb5f5b1650a749c3b86300ee..5308fb39e3040dae0075e96c5bf78428806fa55c 100644
(file)
--- a/
arch/x86/kernel/process.c
+++ b/
arch/x86/kernel/process.c
@@
-302,7
+302,7
@@
void arch_cpu_idle(void)
/*
* We use this if we don't have any better idle routine..
*/
/*
* We use this if we don't have any better idle routine..
*/
-void default_idle(void)
+void
__cpuidle
default_idle(void)
{
trace_cpu_idle_rcuidle(1, smp_processor_id());
safe_halt();
{
trace_cpu_idle_rcuidle(1, smp_processor_id());
safe_halt();
@@
-417,7
+417,7
@@
static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)
* with interrupts enabled and no flags, which is backwards compatible with the
* original MWAIT implementation.
*/
* with interrupts enabled and no flags, which is backwards compatible with the
* original MWAIT implementation.
*/
-static void mwait_idle(void)
+static
__cpuidle
void mwait_idle(void)
{
if (!current_set_polling_and_test()) {
trace_cpu_idle_rcuidle(1, smp_processor_id());
{
if (!current_set_polling_and_test()) {
trace_cpu_idle_rcuidle(1, smp_processor_id());
@@
-509,8
+509,7
@@
unsigned long arch_align_stack(unsigned long sp)
unsigned long arch_randomize_brk(struct mm_struct *mm)
{
unsigned long arch_randomize_brk(struct mm_struct *mm)
{
- unsigned long range_end = mm->brk + 0x02000000;
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+ return randomize_page(mm->brk, 0x02000000);
}
/*
}
/*
This page took
0.03663 seconds
and
5
git commands to generate.