x86 fixes
Subsystems (4)
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Andy Isaacson (2):
x86: Factor duplicated code out of __show_regs() into show_regs_common()
x86: Print DMI_BOARD_NAME as well as DMI_PRODUCT_NAME from __show_regs()
Hidetoshi Seto (1):
x86, mce: fix confusion between bank attributes and mce attributes
Jan Beulich (1):
x86/mce: Set up timer unconditionally
Joe Perches (6):
arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix
x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)
x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)
x86: i8254.c: Add pr_fmt(fmt)
x86: kmmio.c: Add and use pr_fmt(fmt)
x86: mmio-mod.c: Use pr_fmt
Joerg Roedel (2):
x86/amd-iommu: Fix passthrough mode x86/amd-iommu: Fix PCI hotplug with passthrough mode
Leann Ogasawara (1):
x86: ASUS P4S800 reboot=bios quirk
Shaun Patterson (1):
x86: Fix typo in arch/x86/mm/kmmio.c
Thomas Gleixner (1):
x86: Fix bogus warning in apic_noop.apic_write()
arch/x86/include/asm/amd_iommu_proto.h | 4 +- arch/x86/include/asm/system.h | 1 + arch/x86/kernel/amd_iommu.c | 46 +++++++++++++++++++-- arch/x86/kernel/amd_iommu_init.c | 9 ++++ arch/x86/kernel/apic/apic_noop.c | 2 +- arch/x86/kernel/apic/es7000_32.c | 12 +++-- arch/x86/kernel/cpu/mcheck/mce.c | 5 +- arch/x86/kernel/microcode_amd.c | 40 ++++++++--------- arch/x86/kernel/microcode_core.c | 26 ++++++----- arch/x86/kernel/microcode_intel.c | 47 +++++++++------------ arch/x86/kernel/process.c | 21 +++++++++ arch/x86/kernel/process_32.c | 14 +------ arch/x86/kernel/process_64.c | 16 +------ arch/x86/kernel/reboot.c | 8 ++++ arch/x86/kernel/setup_percpu.c | 13 +++--- arch/x86/kvm/i8254.c | 12 +++-- arch/x86/mm/kmmio.c | 42 +++++++++--------- arch/x86/mm/mmio-mod.c | 71 ++++++++++++++++---------------- 18 files changed, 221 insertions(+), 168 deletions(-)
arch/x86/include/asm/amd_iommu_proto.h +3 -1
@@ -28,7 +28,9 @@ extern void amd_iommu_flush_all_domains(void);extern void amd_iommu_flush_all_devices (void );extern void amd_iommu_apply_erratum_63 (u16 devid);extern void amd_iommu_reset_cmd_buffer (struct amd_iommu *iommu); - +extern int amd_iommu_init_devices (void ); +extern void amd_iommu_uninit_devices (void ); +extern void amd_iommu_init_notifier (void );#ifndef CONFIG_AMD_IOMMU_STATS static inline void amd_iommu_stats_init (void ) { }
arch/x86/include/asm/system.h +1 -0
@@ -23,6 +23,7 @@ struct task_struct *__switch_to(struct task_struct *prev,struct tss_struct ;void __switch_to_xtra (struct task_struct *prev_p,struct task_struct *next_p,struct tss_struct *tss); +extern void show_regs_common (void );#ifdef CONFIG_X86_32
arch/x86/kernel/amd_iommu.c +42 -4
70 lines not on this page · raw message
arch/x86/kernel/amd_iommu_init.c +9 -0
@@ -1274,6 +1274,10 @@ static int __init amd_iommu_init(void)if (ret) goto free; + ret =amd_iommu_init_devices (); +if (ret) + goto free; +if (iommu_pass_through) ret =amd_iommu_init_passthrough ();else
@@ -1281,6 +1285,8 @@ static int __init amd_iommu_init(void)if (ret) goto free; +amd_iommu_init_notifier (); +enable_iommus ();if (iommu_pass_through)
@@ -1296,6 +1302,9 @@ out:return ret; free: + +amd_iommu_uninit_devices (); +free_pages ((unsigned long )amd_iommu_pd_alloc_bitmap,get_order (MAX_DOMAIN_ID /8 ));
arch/x86/kernel/apic/apic_noop.c +1 -1
@@ -127,7 +127,7 @@ static u32 noop_apic_read(u32 reg)static void noop_apic_write (u32 reg,u32 v) { -WARN_ON_ONCE ((cpu_has_apic || !disable_apic)); +WARN_ON_ONCE (cpu_has_apic && !disable_apic); }struct apic apic_noop = {
arch/x86/kernel/apic/es7000_32.c +7 -5
@@ -27,6 +27,9 @@* * http://www.unisys.com */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/notifier.h> #include <linux/spinlock.h> #include <linux/cpumask.h>
@@ -223,9 +226,9 @@ static int parse_unisys_oem(char *oemptr) mip_addr = val; mip = (struct mip_reg *)val; mip_reg =__va (mip); -pr_debug ("es7000_mipcfg: host_reg = 0x%lx \n" , +pr_debug ("host_reg = 0x%lx\n" , (unsigned long )host_reg); -pr_debug ("es7000_mipcfg: mip_reg = 0x%lx \n" , +pr_debug ("mip_reg = 0x%lx\n" , (unsigned long )mip_reg); success++;break ;
@@ -401,7 +404,7 @@ static void es7000_enable_apic_mode(void)if (!es7000_plat)return ; -printk (KERN_INFO "ES7000: Enabling APIC mode.\n" ); +pr_info ("Enabling APIC mode.\n" );memset (&es7000_mip_reg,0 ,sizeof (struct mip_reg )); es7000_mip_reg.off_0x00 =MIP_SW_APIC ; es7000_mip_reg.off_0x38 =MIP_VALID ;
@@ -514,8 +517,7 @@ static void es7000_setup_apic_routing(void) {int apic =per_cpu (x86_bios_cpu_apicid,smp_processor_id ()); -printk (KERN_INFO -"Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n" , +pr_info ("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n" , (apic_version[apic] ==0x14 ) ?"Physical Cluster" :"Logical Cluster" , nr_ioapics,cpumask_bits (es7000_target_cpus ())[0 ]);
arch/x86/kernel/cpu/mcheck/mce.c +3 -2
@@ -1388,13 +1388,14 @@ static void __mcheck_cpu_init_timer(void)struct timer_list *t = &__get_cpu_var (mce_timer);int *n = &__get_cpu_var (mce_next_interval); +setup_timer (t, mce_start_timer,smp_processor_id ()); +if (mce_ignore_ce)return ; *n = check_interval *HZ ;if (!*n)return ; -setup_timer (t, mce_start_timer,smp_processor_id ()); t->expires =round_jiffies (jiffies + *n);add_timer_on (t,smp_processor_id ()); }
@@ -1928,7 +1929,7 @@ error2:sysdev_remove_file (&per_cpu (mce_dev, cpu), &mce_banks[j].attr); error:while (--i >=0 ) -sysdev_remove_file (&per_cpu (mce_dev, cpu), &mce_banks[i].attr); +sysdev_remove_file (&per_cpu (mce_dev, cpu), mce_attrs[i]);sysdev_unregister (&per_cpu (mce_dev, cpu));
arch/x86/kernel/microcode_amd.c +19 -21
@@ -13,6 +13,9 @@* Licensed under the terms of the GNU General Public * License version 2. See file COPYING for details. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/firmware.h> #include <linux/pci_ids.h> #include <linux/uaccess.h>
@@ -81,7 +84,7 @@ static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig)memset (csig,0 ,sizeof (*csig));rdmsr (MSR_AMD64_PATCH_LEVEL , csig->rev, dummy); -pr_info ("microcode: CPU%d: patch_level=0x%x\n" , cpu, csig->rev); +pr_info ("CPU%d: patch_level=0x%x\n" , cpu, csig->rev);return 0 ; }
@@ -111,8 +114,8 @@ static int get_matching_microcode(int cpu, void *mc, int rev)/* ucode might be chipset specific -- currently we don't support this */ if (mc_header->nb_dev_id || mc_header->sb_dev_id) { -pr_err (KERN_ERR "microcode: CPU%d: loading of chipset " -"specific code not yet supported\n" , cpu); +pr_err ("CPU%d: loading of chipset specific code not yet supported\n" , + cpu);return 0 ; }
@@ -141,12 +144,12 @@ static int apply_microcode_amd(int cpu)/* check current patch id and patch's id for match */ if (rev != mc_amd->hdr.patch_id) { -pr_err ("microcode: CPU%d: update failed " -"(for patch_level=0x%x)\n" , cpu, mc_amd->hdr.patch_id); +pr_err ("CPU%d: update failed (for patch_level=0x%x)\n" , + cpu, mc_amd->hdr.patch_id);return -1 ; } -pr_info ("microcode: CPU%d: updated (new patch_level=0x%x)\n" , cpu, rev); +pr_info ("CPU%d: updated (new patch_level=0x%x)\n" , cpu, rev); uci->cpu_sig.rev = rev;return 0 ;
@@ -169,15 +172,14 @@ get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)return NULL ;if (section_hdr[0 ] !=UCODE_UCODE_TYPE ) { -pr_err ("microcode: error: invalid type field in " -"container file section header\n" ); +pr_err ("error: invalid type field in container file section header\n" );return NULL ; } total_size = (unsigned long ) (section_hdr[4 ] + (section_hdr[5 ] <<8 ));if (total_size > size || total_size >UCODE_MAX_SIZE ) { -pr_err ("microcode: error: size mismatch\n" ); +pr_err ("error: size mismatch\n" );return NULL ; }
@@ -206,14 +208,13 @@ static int install_equiv_cpu_table(const u8 *buf) size = buf_pos[2 ];if (buf_pos[1 ] !=UCODE_EQUIV_CPU_TABLE_TYPE || !size) { -pr_err ("microcode: error: invalid type field in " -"container file section header\n" ); +pr_err ("error: invalid type field in container file section header\n" );return 0 ; } equiv_cpu_table = (struct equiv_cpu_entry *)vmalloc (size);if (!equiv_cpu_table) { -pr_err ("microcode: failed to allocate equivalent CPU table\n" ); +pr_err ("failed to allocate equivalent CPU table\n" );return 0 ; }
@@ -246,7 +247,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size) offset =install_equiv_cpu_table (ucode_ptr);if (!offset) { -pr_err ("microcode: failed to create equivalent cpu table\n" ); +pr_err ("failed to create equivalent cpu table\n" );return UCODE_ERROR ; }
@@ -277,8 +278,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)if (!leftover) {vfree (uci->mc); uci->mc = new_mc; -pr_debug ("microcode: CPU%d found a matching microcode " -"update with version 0x%x (current=0x%x)\n" , +pr_debug ("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n" , cpu, new_rev, uci->cpu_sig.rev); }else {vfree (new_mc);
@@ -300,7 +300,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)return UCODE_NFOUND ;if (*(u32 *)firmware->data !=UCODE_MAGIC ) { -pr_err ("microcode: invalid UCODE_MAGIC (0x%08x)\n" , +pr_err ("invalid UCODE_MAGIC (0x%08x)\n" , *(u32 *)firmware->data);return UCODE_ERROR ; }
@@ -313,8 +313,7 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)static enum ucode_state request_microcode_user (int cpu,const void __user *buf,size_t size) { -pr_info ("microcode: AMD microcode update via " -"/dev/cpu/microcode not supported\n" ); +pr_info ("AMD microcode update via /dev/cpu/microcode not supported\n" );return UCODE_ERROR ; }
@@ -334,14 +333,13 @@ void init_microcode_amd(struct device *device)WARN_ON (c->x86_vendor !=X86_VENDOR_AMD );if (c->x86 <0x10 ) { -pr_warning ("microcode: AMD CPU family 0x%x not supported\n" , - c->x86); +pr_warning ("AMD CPU family 0x%x not supported\n" , c->x86);return ; } supported_cpu =1 ;if (request_firmware (&firmware, fw_name, device)) -pr_err ("microcode: failed to load file %s\n" , fw_name); +pr_err ("failed to load file %s\n" , fw_name); }void fini_microcode_amd (void )
arch/x86/kernel/microcode_core.c +14 -12
@@ -70,6 +70,9 @@* Fix sigmatch() macro to handle old CPUs with pf == 0. * Thanks to Stuart Swales for pointing out this bug. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/platform_device.h> #include <linux/miscdevice.h> #include <linux/capability.h>
@@ -209,7 +212,7 @@ static ssize_t microcode_write(struct file *file, const char __user *buf,ssize_t ret = -EINVAL ;if ((len >>PAGE_SHIFT ) > totalram_pages) { -pr_err ("microcode: too much data (max %ld pages)\n" , totalram_pages); +pr_err ("too much data (max %ld pages)\n" , totalram_pages);return ret; }
@@ -244,7 +247,7 @@ static int __init microcode_dev_init(void) error =misc_register (µcode_dev);if (error) { -pr_err ("microcode: can't misc_register on minor=%d\n" ,MICROCODE_MINOR ); +pr_err ("can't misc_register on minor=%d\n" ,MICROCODE_MINOR );return error; }
@@ -359,7 +362,7 @@ static enum ucode_state microcode_resume_cpu(int cpu)if (!uci->mc)return UCODE_NFOUND ; -pr_debug ("microcode: CPU%d updated upon resume\n" , cpu); +pr_debug ("CPU%d updated upon resume\n" , cpu);apply_microcode_on_target (cpu);return UCODE_OK ;
@@ -379,7 +382,7 @@ static enum ucode_state microcode_init_cpu(int cpu) ustate = microcode_ops->request_microcode_fw (cpu, µcode_pdev->dev);if (ustate ==UCODE_OK ) { -pr_debug ("microcode: CPU%d updated upon init\n" , cpu); +pr_debug ("CPU%d updated upon init\n" , cpu);apply_microcode_on_target (cpu); }
@@ -406,7 +409,7 @@ static int mc_sysdev_add(struct sys_device *sys_dev)if (!cpu_online (cpu))return 0 ; -pr_debug ("microcode: CPU%d added\n" , cpu); +pr_debug ("CPU%d added\n" , cpu); err =sysfs_create_group (&sys_dev->kobj, &mc_attr_group);if (err)
@@ -425,7 +428,7 @@ static int mc_sysdev_remove(struct sys_device *sys_dev)if (!cpu_online (cpu))return 0 ; -pr_debug ("microcode: CPU%d removed\n" , cpu); +pr_debug ("CPU%d removed\n" , cpu);microcode_fini_cpu (cpu);sysfs_remove_group (&sys_dev->kobj, &mc_attr_group);return 0 ;
@@ -473,15 +476,15 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)microcode_update_cpu (cpu);case CPU_DOWN_FAILED :case CPU_DOWN_FAILED_FROZEN : -pr_debug ("microcode: CPU%d added\n" , cpu); +pr_debug ("CPU%d added\n" , cpu);if (sysfs_create_group (&sys_dev->kobj, &mc_attr_group)) -pr_err ("microcode: Failed to create group for CPU%d\n" , cpu); +pr_err ("Failed to create group for CPU%d\n" , cpu);break ;case CPU_DOWN_PREPARE :case CPU_DOWN_PREPARE_FROZEN :/* Suspend is in progress, only remove the interface */ sysfs_remove_group (&sys_dev->kobj, &mc_attr_group); -pr_debug ("microcode: CPU%d removed\n" , cpu); +pr_debug ("CPU%d removed\n" , cpu);break ;case CPU_DEAD :case CPU_UP_CANCELED_FROZEN :
@@ -507,7 +510,7 @@ static int __init microcode_init(void) microcode_ops =init_amd_microcode ();if (!microcode_ops) { -pr_err ("microcode: no support for this CPU vendor\n" ); +pr_err ("no support for this CPU vendor\n" );return -ENODEV ; }
@@ -541,8 +544,7 @@ static int __init microcode_init(void)register_hotcpu_notifier (&mc_cpu_notifier);pr_info ("Microcode Update Driver: v" MICROCODE_VERSION -" <[email protected]>," -" Peter Oruba\n" ); +" <[email protected]>, Peter Oruba\n" );return 0 ; }
arch/x86/kernel/microcode_intel.c +20 -27
129 lines not on this page · raw message
arch/x86/kernel/process.c +21 -0
@@ -10,6 +10,8 @@#include <linux/clockchips.h> #include <linux/random.h> #include <linux/user-return-notifier.h> +#include <linux/dmi.h> +#include <linux/utsname.h> #include <trace/events/power.h> #include <linux/hw_breakpoint.h> #include <asm/system.h>
@@ -90,6 +92,25 @@ void exit_thread(void) } } +void show_regs_common (void ) +{ +const char *board, *product; + + board =dmi_get_system_info (DMI_BOARD_NAME ); +if (!board) + board ="" ; + product =dmi_get_system_info (DMI_PRODUCT_NAME ); +if (!product) + product ="" ; + +printk ("\n" ); +printk (KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s/%s\n" , + current->pid, current->comm,print_tainted (), +init_utsname ()->release, + (int )strcspn (init_utsname ()->version," " ), +init_utsname ()->version, board, product); +} +void flush_thread (void ) {struct task_struct *tsk = current;
arch/x86/kernel/process_32.c +1 -13
@@ -23,7 +23,6 @@#include <linux/vmalloc.h> #include <linux/user.h> #include <linux/interrupt.h> -#include <linux/utsname.h> #include <linux/delay.h> #include <linux/reboot.h> #include <linux/init.h>
@@ -35,7 +34,6 @@#include <linux/tick.h> #include <linux/percpu.h> #include <linux/prctl.h> -#include <linux/dmi.h> #include <linux/ftrace.h> #include <linux/uaccess.h> #include <linux/io.h>
@@ -128,7 +126,6 @@ void __show_regs(struct pt_regs *regs, int all)unsigned long d0, d1, d2, d3, d6, d7;unsigned long sp;unsigned short ss, gs; -const char *board;if (user_mode_vm (regs)) { sp = regs->sp;
@@ -140,16 +137,7 @@ void __show_regs(struct pt_regs *regs, int all)savesegment (gs, gs); } -printk ("\n" ); - - board =dmi_get_system_info (DMI_PRODUCT_NAME ); -if (!board) - board ="" ; -printk ("Pid: %d, comm: %s %s (%s %.*s) %s\n" , -task_pid_nr (current), current->comm, -print_tainted (),init_utsname ()->release, - (int )strcspn (init_utsname ()->version," " ), -init_utsname ()->version, board); +show_regs_common (); printk("EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n", (u16)regs->cs, regs->ip, regs->flags,
arch/x86/kernel/process_64.c +2 -14
@@ -26,7 +26,6 @@#include <linux/slab.h> #include <linux/user.h> #include <linux/interrupt.h> -#include <linux/utsname.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/ptrace.h>
@@ -38,7 +37,6 @@#include <linux/uaccess.h> #include <linux/io.h> #include <linux/ftrace.h> -#include <linux/dmi.h> #include <asm/pgtable.h> #include <asm/system.h>
@@ -163,18 +161,8 @@ void __show_regs(struct pt_regs *regs, int all)unsigned long d0, d1, d2, d3, d6, d7;unsigned int fsindex, gsindex;unsigned int ds, cs, es; -const char *board; - -printk ("\n" ); -print_modules (); - board =dmi_get_system_info (DMI_PRODUCT_NAME ); -if (!board) - board ="" ; -printk (KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n" , - current->pid, current->comm,print_tainted (), -init_utsname ()->release, - (int )strcspn (init_utsname ()->version," " ), -init_utsname ()->version, board); + +show_regs_common ();printk (KERN_INFO "RIP: %04lx:[<%016lx>] " , regs->cs &0xffff , regs->ip);printk_address (regs->ip,1 ); printk(KERN_INFO "RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss,
arch/x86/kernel/reboot.c +8 -0
@@ -259,6 +259,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "SBC-FITPC2"), }, }, + { /* Handle problems with rebooting on ASUS P4S800 */ + .callback = set_bios_reboot, + .ident = "ASUS P4S800", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P4S800"), + }, + }, { } };
arch/x86/kernel/setup_percpu.c +7 -6
@@ -1,3 +1,5 @@ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h>
@@ -20,9 +22,9 @@#include <asm/stackprotector.h> #ifdef CONFIG_DEBUG_PER_CPU_MAPS -# define DBG(x...) printk(KERN_DEBUG x) +# define DBG (fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)#else -# define DBG(x...) +# define DBG (fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)#endif DEFINE_PER_CPU (int, cpu_number);
@@ -116,8 +118,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, } else { ptr =__alloc_bootmem_node_nopanic (NODE_DATA (node), size, align, goal); -pr_debug ("per cpu data for cpu%d %lu bytes on node%d at " -"%016lx\n" , cpu, size, node,__pa (ptr)); +pr_debug ("per cpu data for cpu%d %lu bytes on node%d at %016lx\n" , + cpu, size, node,__pa (ptr)); }return ptr;#else
@@ -198,8 +200,7 @@ void __init setup_per_cpu_areas(void) pcpu_cpu_distance, pcpu_fc_alloc, pcpu_fc_free);if (rc <0 ) -pr_warning ("PERCPU: %s allocator failed (%d), " -"falling back to page size\n" , +pr_warning ("%s allocator failed (%d), falling back to page size\n" , pcpu_fc_names[pcpu_chosen_fc], rc); }if (rc <0 )
arch/x86/kvm/i8254.c +7 -5
@@ -29,6 +29,8 @@* Based on QEMU and Xen. */ +#define pr_fmt (fmt) "pit: " fmt +#include <linux/kvm_host.h> #include "irq.h"
@@ -262,7 +264,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)static void destroy_pit_timer (struct kvm_timer *pt) { -pr_debug ("pit: execute del timer!\n" ); +pr_debug ("execute del timer!\n" );hrtimer_cancel (&pt->timer); }
@@ -284,7 +286,7 @@ static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period) interval =muldiv64 (val,NSEC_PER_SEC ,KVM_PIT_FREQ ); -pr_debug ("pit: create pit timer, interval is %llu nsec\n" , interval); +pr_debug ("create pit timer, interval is %llu nsec\n" , interval);/* TODO The new value only affected after the retriggered */ hrtimer_cancel (&pt->timer);
@@ -309,7 +311,7 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)WARN_ON (!mutex_is_locked (&ps->lock)); -pr_debug ("pit: load_count val is %d, channel is %d\n" , val, channel); +pr_debug ("load_count val is %d, channel is %d\n" , val, channel);/* * The largest possible initial count is 0; this is equivalent
@@ -395,8 +397,8 @@ static int pit_ioport_write(struct kvm_io_device *this,mutex_lock (&pit_state->lock);if (val !=0 ) -pr_debug ("pit: write addr is 0x%x, len is %d, val is 0x%x\n" , - (unsigned int )addr, len, val); +pr_debug ("write addr is 0x%x, len is %d, val is 0x%x\n" , + (unsigned int )addr, len, val);if (addr ==3 ) { channel = val >>6 ;
arch/x86/mm/kmmio.c +21 -21
107 lines not on this page · raw message
arch/x86/mm/mmio-mod.c +35 -36
194 lines not on this page · raw message