From: Jeff Garzik <jgarzik@mandrakesoft.com>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Linux-Kernel list <linux-kernel@vger.kernel.org>, hpa@zytor.com
Subject: PATCH 2.5.2.6: fix cpuid, msr builds
Date: Tue, 01 Jan 2002 20:20:42 -0500 [thread overview]
Message-ID: <3C32606A.7240E019@mandrakesoft.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
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 | - nomeansno
[-- Attachment #2: i386-2.5.2.6.patch --]
[-- Type: text/plain, Size: 1873 bytes --]
Index: 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)) )
reply other threads:[~2002-01-02 1:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3C32606A.7240E019@mandrakesoft.com \
--to=jgarzik@mandrakesoft.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.