Messages in this thread Patch in this message | | | Date | Tue, 01 Jan 2002 20:20:42 -0500 | From | Jeff Garzik <> | Subject | PATCH 2.5.2.6: fix cpuid, msr builds |
| |
Obvious changes, the drivers manage the minor number similar to other chr drivers -- Jeff Garzik | Only so many songs can be sung Building 1024 | with two lips, two lungs, and one tongue. MandrakeSoft | - nomeansnoIndex: arch/i386/kernel/cpuid.c =================================================================== RCS file: /cvsroot/gkernel/linux_2_5/arch/i386/kernel/cpuid.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 cpuid.c --- arch/i386/kernel/cpuid.c 2001/10/11 16:04:57 1.1.1.1 +++ arch/i386/kernel/cpuid.c 2002/01/02 01:15:26 @@ -101,7 +101,7 @@ u32 data[4]; size_t rv; u32 reg = *ppos; - int cpu = MINOR(file->f_dentry->d_inode->i_rdev); + int cpu = minor(file->f_dentry->d_inode->i_rdev); if ( count % 16 ) return -EINVAL; /* Invalid chunk size */ @@ -119,7 +119,7 @@ static int cpuid_open(struct inode *inode, struct file *file) { - int cpu = MINOR(file->f_dentry->d_inode->i_rdev); + int cpu = minor(file->f_dentry->d_inode->i_rdev); struct cpuinfo_x86 *c = &(cpu_data)[cpu]; if ( !(cpu_online_map & (1UL << cpu)) ) Index: arch/i386/kernel/msr.c =================================================================== RCS file: /cvsroot/gkernel/linux_2_5/arch/i386/kernel/msr.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 msr.c --- arch/i386/kernel/msr.c 2001/10/11 16:04:57 1.1.1.1 +++ arch/i386/kernel/msr.c 2002/01/02 01:15:26 @@ -181,7 +181,7 @@ u32 data[2]; size_t rv; u32 reg = *ppos; - int cpu = MINOR(file->f_dentry->d_inode->i_rdev); + int cpu = minor(file->f_dentry->d_inode->i_rdev); int err; if ( count % 8 ) @@ -206,7 +206,7 @@ u32 data[2]; size_t rv; u32 reg = *ppos; - int cpu = MINOR(file->f_dentry->d_inode->i_rdev); + int cpu = minor(file->f_dentry->d_inode->i_rdev); int err; if ( count % 8 ) @@ -226,7 +226,7 @@ static int msr_open(struct inode *inode, struct file *file) { - int cpu = MINOR(file->f_dentry->d_inode->i_rdev); + int cpu = minor(file->f_dentry->d_inode->i_rdev); struct cpuinfo_x86 *c = &(cpu_data)[cpu]; if ( !(cpu_online_map & (1UL << cpu)) ) | |