Commit 368f8998 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "This contains the following fixes and improvements:

   - Avoid dereferencing an unprotected VMA pointer in the fault signal
     generation code

   - Fix inline asm call constraints for GCC 4.4

   - Use existing register variable to retrieve the stack pointer
     instead of forcing the compiler to create another indirect access
     which results in excessive extra 'mov %rsp, %<dst>' instructions

   - Disable branch profiling for the memory encryption code to prevent
     an early boot crash

   - Fix a sparse warning caused by casting the __user annotation in
     __get_user_asm_u64() away

   - Fix an off by one error in the loop termination of the error patch
     in the x86 sysfs init code

   - Add missing CPU IDs to various Intel specific drivers to enable the
     functionality on recent hardware

   - More (init) constification in the numachip code"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/asm: Use register variable to get stack pointer value
  x86/mm: Disable branch profiling in mem_encrypt.c
  x86/asm: Fix inline asm call constraints for GCC 4.4
  perf/x86/intel/uncore: Correct num_boxes for IIO and IRP
  perf/x86/intel/rapl: Add missing CPU IDs
  perf/x86/msr: Add missing CPU IDs
  perf/x86/intel/cstate: Add missing CPU IDs
  x86: Don't cast away the __user in __get_user_asm_u64()
  x86/sysfs: Fix off-by-one error in loop termination
  x86/mm: Fix fault error path using unsafe vma pointer
  x86/numachip: Add const and __initconst to numachip2_clockevent
parents c42ed9f9 196bd485
...@@ -552,6 +552,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { ...@@ -552,6 +552,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE, snb_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, snb_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates), X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates),
...@@ -560,6 +561,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { ...@@ -560,6 +561,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates), X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates), X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_DENVERTON, glm_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GEMINI_LAKE, glm_cstates),
{ }, { },
}; };
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match); MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);
......
...@@ -775,6 +775,9 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { ...@@ -775,6 +775,9 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, hsw_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, hsw_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_DENVERTON, hsw_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GEMINI_LAKE, hsw_rapl_init),
{}, {},
}; };
......
...@@ -3462,7 +3462,7 @@ static struct intel_uncore_ops skx_uncore_iio_ops = { ...@@ -3462,7 +3462,7 @@ static struct intel_uncore_ops skx_uncore_iio_ops = {
static struct intel_uncore_type skx_uncore_iio = { static struct intel_uncore_type skx_uncore_iio = {
.name = "iio", .name = "iio",
.num_counters = 4, .num_counters = 4,
.num_boxes = 5, .num_boxes = 6,
.perf_ctr_bits = 48, .perf_ctr_bits = 48,
.event_ctl = SKX_IIO0_MSR_PMON_CTL0, .event_ctl = SKX_IIO0_MSR_PMON_CTL0,
.perf_ctr = SKX_IIO0_MSR_PMON_CTR0, .perf_ctr = SKX_IIO0_MSR_PMON_CTR0,
...@@ -3492,7 +3492,7 @@ static const struct attribute_group skx_uncore_format_group = { ...@@ -3492,7 +3492,7 @@ static const struct attribute_group skx_uncore_format_group = {
static struct intel_uncore_type skx_uncore_irp = { static struct intel_uncore_type skx_uncore_irp = {
.name = "irp", .name = "irp",
.num_counters = 2, .num_counters = 2,
.num_boxes = 5, .num_boxes = 6,
.perf_ctr_bits = 48, .perf_ctr_bits = 48,
.event_ctl = SKX_IRP0_MSR_PMON_CTL0, .event_ctl = SKX_IRP0_MSR_PMON_CTL0,
.perf_ctr = SKX_IRP0_MSR_PMON_CTR0, .perf_ctr = SKX_IRP0_MSR_PMON_CTR0,
......
...@@ -63,6 +63,14 @@ static bool test_intel(int idx) ...@@ -63,6 +63,14 @@ static bool test_intel(int idx)
case INTEL_FAM6_ATOM_SILVERMONT1: case INTEL_FAM6_ATOM_SILVERMONT1:
case INTEL_FAM6_ATOM_SILVERMONT2: case INTEL_FAM6_ATOM_SILVERMONT2:
case INTEL_FAM6_ATOM_AIRMONT: case INTEL_FAM6_ATOM_AIRMONT:
case INTEL_FAM6_ATOM_GOLDMONT:
case INTEL_FAM6_ATOM_DENVERTON:
case INTEL_FAM6_ATOM_GEMINI_LAKE:
case INTEL_FAM6_XEON_PHI_KNL:
case INTEL_FAM6_XEON_PHI_KNM:
if (idx == PERF_MSR_SMI) if (idx == PERF_MSR_SMI)
return true; return true;
break; break;
......
...@@ -11,10 +11,12 @@ ...@@ -11,10 +11,12 @@
# define __ASM_FORM_COMMA(x) " " #x "," # define __ASM_FORM_COMMA(x) " " #x ","
#endif #endif
#ifdef CONFIG_X86_32 #ifndef __x86_64__
/* 32 bit */
# define __ASM_SEL(a,b) __ASM_FORM(a) # define __ASM_SEL(a,b) __ASM_FORM(a)
# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a) # define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a)
#else #else
/* 64 bit */
# define __ASM_SEL(a,b) __ASM_FORM(b) # define __ASM_SEL(a,b) __ASM_FORM(b)
# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b) # define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b)
#endif #endif
...@@ -139,8 +141,8 @@ ...@@ -139,8 +141,8 @@
* gets set up by the containing function. If you forget to do this, objtool * gets set up by the containing function. If you forget to do this, objtool
* may print a "call without frame pointer save/setup" warning. * may print a "call without frame pointer save/setup" warning.
*/ */
register unsigned int __asm_call_sp asm("esp"); register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (__asm_call_sp) #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
#endif #endif
#endif /* _ASM_X86_ASM_H */ #endif /* _ASM_X86_ASM_H */
...@@ -158,17 +158,6 @@ struct thread_info { ...@@ -158,17 +158,6 @@ struct thread_info {
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
static inline unsigned long current_stack_pointer(void)
{
unsigned long sp;
#ifdef CONFIG_X86_64
asm("mov %%rsp,%0" : "=g" (sp));
#else
asm("mov %%esp,%0" : "=g" (sp));
#endif
return sp;
}
/* /*
* Walks up the stack frames to make sure that the specified object is * Walks up the stack frames to make sure that the specified object is
* entirely contained by a single stack frame. * entirely contained by a single stack frame.
......
...@@ -337,7 +337,7 @@ do { \ ...@@ -337,7 +337,7 @@ do { \
_ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(1b, 4b) \
_ASM_EXTABLE(2b, 4b) \ _ASM_EXTABLE(2b, 4b) \
: "=r" (retval), "=&A"(x) \ : "=r" (retval), "=&A"(x) \
: "m" (__m(__ptr)), "m" __m(((u32 *)(__ptr)) + 1), \ : "m" (__m(__ptr)), "m" __m(((u32 __user *)(__ptr)) + 1), \
"i" (errret), "0" (retval)); \ "i" (errret), "0" (retval)); \
}) })
......
...@@ -64,7 +64,7 @@ static void call_on_stack(void *func, void *stack) ...@@ -64,7 +64,7 @@ static void call_on_stack(void *func, void *stack)
static inline void *current_stack(void) static inline void *current_stack(void)
{ {
return (void *)(current_stack_pointer() & ~(THREAD_SIZE - 1)); return (void *)(current_stack_pointer & ~(THREAD_SIZE - 1));
} }
static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc) static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc)
...@@ -88,7 +88,7 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc) ...@@ -88,7 +88,7 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc)
/* Save the next esp at the bottom of the stack */ /* Save the next esp at the bottom of the stack */
prev_esp = (u32 *)irqstk; prev_esp = (u32 *)irqstk;
*prev_esp = current_stack_pointer(); *prev_esp = current_stack_pointer;
if (unlikely(overflow)) if (unlikely(overflow))
call_on_stack(print_stack_overflow, isp); call_on_stack(print_stack_overflow, isp);
...@@ -139,7 +139,7 @@ void do_softirq_own_stack(void) ...@@ -139,7 +139,7 @@ void do_softirq_own_stack(void)
/* Push the previous esp onto the stack */ /* Push the previous esp onto the stack */
prev_esp = (u32 *)irqstk; prev_esp = (u32 *)irqstk;
*prev_esp = current_stack_pointer(); *prev_esp = current_stack_pointer;
call_on_stack(__do_softirq, isp); call_on_stack(__do_softirq, isp);
} }
......
...@@ -299,7 +299,7 @@ static int __init create_setup_data_nodes(struct kobject *parent) ...@@ -299,7 +299,7 @@ static int __init create_setup_data_nodes(struct kobject *parent)
return 0; return 0;
out_clean_nodes: out_clean_nodes:
for (j = i - 1; j > 0; j--) for (j = i - 1; j >= 0; j--)
cleanup_setup_data_node(*(kobjp + j)); cleanup_setup_data_node(*(kobjp + j));
kfree(kobjp); kfree(kobjp);
out_setup_data_kobj: out_setup_data_kobj:
......
...@@ -142,7 +142,7 @@ void ist_begin_non_atomic(struct pt_regs *regs) ...@@ -142,7 +142,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
* from double_fault. * from double_fault.
*/ */
BUG_ON((unsigned long)(current_top_of_stack() - BUG_ON((unsigned long)(current_top_of_stack() -
current_stack_pointer()) >= THREAD_SIZE); current_stack_pointer) >= THREAD_SIZE);
preempt_enable_no_resched(); preempt_enable_no_resched();
} }
......
...@@ -192,8 +192,7 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr) ...@@ -192,8 +192,7 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
* 6. T1 : reaches here, sees vma_pkey(vma)=5, when we really * 6. T1 : reaches here, sees vma_pkey(vma)=5, when we really
* faulted on a pte with its pkey=4. * faulted on a pte with its pkey=4.
*/ */
static void fill_sig_info_pkey(int si_code, siginfo_t *info, static void fill_sig_info_pkey(int si_code, siginfo_t *info, u32 *pkey)
struct vm_area_struct *vma)
{ {
/* This is effectively an #ifdef */ /* This is effectively an #ifdef */
if (!boot_cpu_has(X86_FEATURE_OSPKE)) if (!boot_cpu_has(X86_FEATURE_OSPKE))
...@@ -209,7 +208,7 @@ static void fill_sig_info_pkey(int si_code, siginfo_t *info, ...@@ -209,7 +208,7 @@ static void fill_sig_info_pkey(int si_code, siginfo_t *info,
* valid VMA, so we should never reach this without a * valid VMA, so we should never reach this without a
* valid VMA. * valid VMA.
*/ */
if (!vma) { if (!pkey) {
WARN_ONCE(1, "PKU fault with no VMA passed in"); WARN_ONCE(1, "PKU fault with no VMA passed in");
info->si_pkey = 0; info->si_pkey = 0;
return; return;
...@@ -219,13 +218,12 @@ static void fill_sig_info_pkey(int si_code, siginfo_t *info, ...@@ -219,13 +218,12 @@ static void fill_sig_info_pkey(int si_code, siginfo_t *info,
* absolutely guranteed to be 100% accurate because of * absolutely guranteed to be 100% accurate because of
* the race explained above. * the race explained above.
*/ */
info->si_pkey = vma_pkey(vma); info->si_pkey = *pkey;
} }
static void static void
force_sig_info_fault(int si_signo, int si_code, unsigned long address, force_sig_info_fault(int si_signo, int si_code, unsigned long address,
struct task_struct *tsk, struct vm_area_struct *vma, struct task_struct *tsk, u32 *pkey, int fault)
int fault)
{ {
unsigned lsb = 0; unsigned lsb = 0;
siginfo_t info; siginfo_t info;
...@@ -240,7 +238,7 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address, ...@@ -240,7 +238,7 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
lsb = PAGE_SHIFT; lsb = PAGE_SHIFT;
info.si_addr_lsb = lsb; info.si_addr_lsb = lsb;
fill_sig_info_pkey(si_code, &info, vma); fill_sig_info_pkey(si_code, &info, pkey);
force_sig_info(si_signo, &info, tsk); force_sig_info(si_signo, &info, tsk);
} }
...@@ -762,8 +760,6 @@ no_context(struct pt_regs *regs, unsigned long error_code, ...@@ -762,8 +760,6 @@ no_context(struct pt_regs *regs, unsigned long error_code,
struct task_struct *tsk = current; struct task_struct *tsk = current;
unsigned long flags; unsigned long flags;
int sig; int sig;
/* No context means no VMA to pass down */
struct vm_area_struct *vma = NULL;
/* Are we prepared to handle this kernel fault? */ /* Are we prepared to handle this kernel fault? */
if (fixup_exception(regs, X86_TRAP_PF)) { if (fixup_exception(regs, X86_TRAP_PF)) {
...@@ -788,7 +784,7 @@ no_context(struct pt_regs *regs, unsigned long error_code, ...@@ -788,7 +784,7 @@ no_context(struct pt_regs *regs, unsigned long error_code,
/* XXX: hwpoison faults will set the wrong code. */ /* XXX: hwpoison faults will set the wrong code. */
force_sig_info_fault(signal, si_code, address, force_sig_info_fault(signal, si_code, address,
tsk, vma, 0); tsk, NULL, 0);
} }
/* /*
...@@ -896,8 +892,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code, ...@@ -896,8 +892,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code,
static void static void
__bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
unsigned long address, struct vm_area_struct *vma, unsigned long address, u32 *pkey, int si_code)
int si_code)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
...@@ -945,7 +940,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, ...@@ -945,7 +940,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_nr = X86_TRAP_PF; tsk->thread.trap_nr = X86_TRAP_PF;
force_sig_info_fault(SIGSEGV, si_code, address, tsk, vma, 0); force_sig_info_fault(SIGSEGV, si_code, address, tsk, pkey, 0);
return; return;
} }
...@@ -958,9 +953,9 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, ...@@ -958,9 +953,9 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
static noinline void static noinline void
bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
unsigned long address, struct vm_area_struct *vma) unsigned long address, u32 *pkey)
{ {
__bad_area_nosemaphore(regs, error_code, address, vma, SEGV_MAPERR); __bad_area_nosemaphore(regs, error_code, address, pkey, SEGV_MAPERR);
} }
static void static void
...@@ -968,6 +963,10 @@ __bad_area(struct pt_regs *regs, unsigned long error_code, ...@@ -968,6 +963,10 @@ __bad_area(struct pt_regs *regs, unsigned long error_code,
unsigned long address, struct vm_area_struct *vma, int si_code) unsigned long address, struct vm_area_struct *vma, int si_code)
{ {
struct mm_struct *mm = current->mm; struct mm_struct *mm = current->mm;
u32 pkey;
if (vma)
pkey = vma_pkey(vma);
/* /*
* Something tried to access memory that isn't in our memory map.. * Something tried to access memory that isn't in our memory map..
...@@ -975,7 +974,8 @@ __bad_area(struct pt_regs *regs, unsigned long error_code, ...@@ -975,7 +974,8 @@ __bad_area(struct pt_regs *regs, unsigned long error_code,
*/ */
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
__bad_area_nosemaphore(regs, error_code, address, vma, si_code); __bad_area_nosemaphore(regs, error_code, address,
(vma) ? &pkey : NULL, si_code);
} }
static noinline void static noinline void
...@@ -1018,7 +1018,7 @@ bad_area_access_error(struct pt_regs *regs, unsigned long error_code, ...@@ -1018,7 +1018,7 @@ bad_area_access_error(struct pt_regs *regs, unsigned long error_code,
static void static void
do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address, do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
struct vm_area_struct *vma, unsigned int fault) u32 *pkey, unsigned int fault)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
int code = BUS_ADRERR; int code = BUS_ADRERR;
...@@ -1045,13 +1045,12 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address, ...@@ -1045,13 +1045,12 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
code = BUS_MCEERR_AR; code = BUS_MCEERR_AR;
} }
#endif #endif
force_sig_info_fault(SIGBUS, code, address, tsk, vma, fault); force_sig_info_fault(SIGBUS, code, address, tsk, pkey, fault);
} }
static noinline void static noinline void
mm_fault_error(struct pt_regs *regs, unsigned long error_code, mm_fault_error(struct pt_regs *regs, unsigned long error_code,
unsigned long address, struct vm_area_struct *vma, unsigned long address, u32 *pkey, unsigned int fault)
unsigned int fault)
{ {
if (fatal_signal_pending(current) && !(error_code & PF_USER)) { if (fatal_signal_pending(current) && !(error_code & PF_USER)) {
no_context(regs, error_code, address, 0, 0); no_context(regs, error_code, address, 0, 0);
...@@ -1075,9 +1074,9 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code, ...@@ -1075,9 +1074,9 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
} else { } else {
if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON| if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON|
VM_FAULT_HWPOISON_LARGE)) VM_FAULT_HWPOISON_LARGE))
do_sigbus(regs, error_code, address, vma, fault); do_sigbus(regs, error_code, address, pkey, fault);
else if (fault & VM_FAULT_SIGSEGV) else if (fault & VM_FAULT_SIGSEGV)
bad_area_nosemaphore(regs, error_code, address, vma); bad_area_nosemaphore(regs, error_code, address, pkey);
else else
BUG(); BUG();
} }
...@@ -1267,6 +1266,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, ...@@ -1267,6 +1266,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
struct mm_struct *mm; struct mm_struct *mm;
int fault, major = 0; int fault, major = 0;
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
u32 pkey;
tsk = current; tsk = current;
mm = tsk->mm; mm = tsk->mm;
...@@ -1467,9 +1467,10 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, ...@@ -1467,9 +1467,10 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
return; return;
} }
pkey = vma_pkey(vma);
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
if (unlikely(fault & VM_FAULT_ERROR)) { if (unlikely(fault & VM_FAULT_ERROR)) {
mm_fault_error(regs, error_code, address, vma, fault); mm_fault_error(regs, error_code, address, &pkey, fault);
return; return;
} }
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define DISABLE_BRANCH_PROFILING
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
......
...@@ -191,7 +191,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next, ...@@ -191,7 +191,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
* mapped in the new pgd, we'll double-fault. Forcibly * mapped in the new pgd, we'll double-fault. Forcibly
* map it. * map it.
*/ */
unsigned int index = pgd_index(current_stack_pointer()); unsigned int index = pgd_index(current_stack_pointer);
pgd_t *pgd = next->pgd + index; pgd_t *pgd = next->pgd + index;
if (unlikely(pgd_none(*pgd))) if (unlikely(pgd_none(*pgd)))
......
...@@ -43,7 +43,7 @@ static int numachip2_set_next_event(unsigned long delta, struct clock_event_devi ...@@ -43,7 +43,7 @@ static int numachip2_set_next_event(unsigned long delta, struct clock_event_devi
return 0; return 0;
} }
static struct clock_event_device numachip2_clockevent = { static const struct clock_event_device numachip2_clockevent __initconst = {
.name = "numachip2", .name = "numachip2",
.rating = 400, .rating = 400,
.set_next_event = numachip2_set_next_event, .set_next_event = numachip2_set_next_event,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment