diff --git a/[refs] b/[refs] index 360ad0398848..2460778b4d6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 575922248c0df490843ddfbcf3bc65b54c4adb08 +refs/heads/master: 1ee4bd92a7aa49eb66c8d5672e837090d3e7b7ff diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c index 640339ee4fb2..c009a241d562 100644 --- a/trunk/arch/x86/mm/pat.c +++ b/trunk/arch/x86/mm/pat.c @@ -31,7 +31,7 @@ #ifdef CONFIG_X86_PAT int __read_mostly pat_enabled = 1; -void __cpuinit pat_disable(const char *reason) +static inline void pat_disable(const char *reason) { pat_enabled = 0; printk(KERN_INFO "%s\n", reason);