[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.44L0.0805211349480.3409-100000@iolanthe.rowland.org>
Date: Wed, 21 May 2008 13:51:17 -0400 (EDT)
From: Alan Stern <stern@...land.harvard.edu>
To: Greg KH <greg@...ah.com>,
Matthew Dharm <mdharm-usb@...-eyed-alien.net>
cc: Christoph Hellwig <hch@...radead.org>,
"Frank Ch. Eigler" <fche@...hat.com>,
Adrian Bunk <bunk@...nel.org>,
USB Storage list <usb-storage@...ts.one-eyed-alien.net>,
Kernel development list <linux-kernel@...r.kernel.org>,
"David S. Miller" <davem@...set.davemloft.net>,
<systemtap@...rces.redhat.com>,
Andrew Morton <akpm@...ux-foundation.org>,
<linux-cifs-client@...ts.samba.org>, <linux-nfs@...r.kernel.org>
Subject: [PATCH] usb-storage: don't call utsname()
This patch (as1100) replaces the core-kernel function call to utsname()
in usb-storage with the UTS_RELEASE macro. It's used only for warning
about extra unusual_devs entries.
Signed-off-by: Alan Stern <stern@...land.harvard.edu>
---
Index: usb-2.6/drivers/usb/storage/usb.c
===================================================================
--- usb-2.6.orig/drivers/usb/storage/usb.c
+++ usb-2.6/drivers/usb/storage/usb.c
@@ -53,7 +53,7 @@
#include <linux/slab.h>
#include <linux/kthread.h>
#include <linux/mutex.h>
-#include <linux/utsname.h>
+#include <linux/utsrelease.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
@@ -531,8 +531,8 @@ static int get_device_info(struct us_dat
if (msg >= 0 && !(us->fflags & US_FL_NEED_OVERRIDE))
printk(KERN_NOTICE USB_STORAGE "This device "
"(%04x,%04x,%04x S %02x P %02x)"
- " has %s in unusual_devs.h (kernel"
- " %s)\n"
+ " has %s in unusual_devs.h (kernel "
+ UTS_RELEASE ")\n"
" Please send a copy of this message to "
"<linux-usb@...r.kernel.org> and "
"<usb-storage@...ts.one-eyed-alien.net>\n",
@@ -541,8 +541,7 @@ static int get_device_info(struct us_dat
le16_to_cpu(ddesc->bcdDevice),
idesc->bInterfaceSubClass,
idesc->bInterfaceProtocol,
- msgs[msg],
- utsname()->release);
+ msgs[msg]);
}
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists