diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-13 15:03:34 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-13 15:03:58 +0700 |
| commit | 5f9dde0757e557d16685d29b21a6055025ec252e (patch) | |
| tree | 5f34dae1bcf94f1865c18ba9aced566abeb855b7 /arch/x86/kernel | |
| parent | 6b5ed324376aa451c3a51e367148da41c21ae36a (diff) | |
| parent | a96dbfbcb58afeec72c2a0a03d205e0e1457ea3d (diff) | |
| download | kernel_samsung_aries-5f9dde0757e557d16685d29b21a6055025ec252e.zip kernel_samsung_aries-5f9dde0757e557d16685d29b21a6055025ec252e.tar.gz kernel_samsung_aries-5f9dde0757e557d16685d29b21a6055025ec252e.tar.bz2 | |
Merge 3.0.63
Change-Id: I9a9716dcb833c128a649864690169473ec4739e1
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/msr.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index 12fcbe2..f7d1a64 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c @@ -175,6 +175,9 @@ static int msr_open(struct inode *inode, struct file *file) unsigned int cpu; struct cpuinfo_x86 *c; + if (!capable(CAP_SYS_RAWIO)) + return -EPERM; + cpu = iminor(file->f_path.dentry->d_inode); if (cpu >= nr_cpu_ids || !cpu_online(cpu)) return -ENXIO; /* No such CPU */ diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index eb9eb8b..6c4e9ff 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -633,6 +633,7 @@ static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10; static bool __init snb_gfx_workaround_needed(void) { +#ifdef CONFIG_PCI int i; u16 vendor, devid; static const u16 snb_ids[] = { @@ -657,6 +658,7 @@ static bool __init snb_gfx_workaround_needed(void) for (i = 0; i < ARRAY_SIZE(snb_ids); i++) if (devid == snb_ids[i]) return true; +#endif return false; } |