[uml-devel] [PATCH] [525/2many] MAINTAINERS - USER-MODE LINUX
Add file pattern to MAINTAINER entry Signed-off-by: Joe Perches <[EMAIL PROTECTED]> diff --git a/MAINTAINERS b/MAINTAINERS index c50b6b1..7d1f87d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4964,6 +4964,9 @@ L:[email protected] L: [EMAIL PROTECTED] W: http://user-mode-linux.sourceforge.net S: Maintained +F: Documentation/uml/UserModeLinux-HOWTO.txt +F: arch/um/ +F: include/asm-um/ FAT/VFAT/MSDOS FILESYSTEM: P: OGAWA Hirofumi - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH net-next 8/8] arch: Use eth_random_addr
Convert the existing uses of random_ether_addr to
the new eth_random_addr.
Signed-off-by: Joe Perches
---
arch/blackfin/mach-bf537/boards/stamp.c |2 +-
arch/c6x/kernel/soc.c |2 +-
arch/mips/ar7/platform.c|4 ++--
arch/mips/powertv/powertv_setup.c |6 +++---
arch/um/drivers/net_kern.c |2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c
b/arch/blackfin/mach-bf537/boards/stamp.c
index c9d9473..5ed654a 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -873,7 +873,7 @@ static struct adf702x_platform_data adf7021_platform_data =
{
};
static inline void adf702x_mac_init(void)
{
- random_ether_addr(adf7021_platform_data.mac_addr);
+ eth_random_addr(adf7021_platform_data.mac_addr);
}
#else
static inline void adf702x_mac_init(void) {}
diff --git a/arch/c6x/kernel/soc.c b/arch/c6x/kernel/soc.c
index 0748c94..3ac7408 100644
--- a/arch/c6x/kernel/soc.c
+++ b/arch/c6x/kernel/soc.c
@@ -80,7 +80,7 @@ int soc_mac_addr(unsigned int index, u8 *addr)
if (have_fuse_mac)
memcpy(addr, c6x_fuse_mac, 6);
else
- random_ether_addr(addr);
+ eth_random_addr(addr);
}
/* adjust for specific EMAC device */
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 1a24d31..1bbc24b 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -310,10 +310,10 @@ static void __init cpmac_get_mac(int instance, unsigned
char *dev_addr)
&dev_addr[4], &dev_addr[5]) != 6) {
pr_warning("cannot parse mac address, "
"using random address\n");
- random_ether_addr(dev_addr);
+ eth_random_addr(dev_addr);
}
} else
- random_ether_addr(dev_addr);
+ eth_random_addr(dev_addr);
}
/*
diff --git a/arch/mips/powertv/powertv_setup.c
b/arch/mips/powertv/powertv_setup.c
index 3933c37..820b848 100644
--- a/arch/mips/powertv/powertv_setup.c
+++ b/arch/mips/powertv/powertv_setup.c
@@ -254,7 +254,7 @@ early_param("rfmac", rfmac_param);
* Generates an Ethernet MAC address that is highly likely to be unique for
* this particular system on a network with other systems of the same type.
*
- * The problem we are solving is that, when random_ether_addr() is used to
+ * The problem we are solving is that, when eth_random_addr() is used to
* generate MAC addresses at startup, there isn't much entropy for the random
* number generator to use and the addresses it produces are fairly likely to
* be the same as those of other identical systems on the same local network.
@@ -269,7 +269,7 @@ early_param("rfmac", rfmac_param);
* Still, this does give us something to work with.
*
* The approach we take is:
- * 1. If we can't get the RF MAC Address, just call random_ether_addr.
+ * 1. If we can't get the RF MAC Address, just call eth_random_addr.
* 2. Use the 24-bit NIC-specific bits of the RF MAC address as the last 24
* bits of the new address. This is very likely to be unique, except for
* the current box.
@@ -299,7 +299,7 @@ void platform_random_ether_addr(u8 addr[ETH_ALEN])
if (!have_rfmac) {
pr_warning("rfmac not available on command line; "
"generating random MAC address\n");
- random_ether_addr(addr);
+ eth_random_addr(addr);
}
else {
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 0d60c56..458d324 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -339,7 +339,7 @@ static int setup_etheraddr(char *str, unsigned char *addr,
char *name)
random:
printk(KERN_INFO
"Choosing a random ethernet address for device %s\n", name);
- random_ether_addr(addr);
+ eth_random_addr(addr);
return 1;
}
--
1.7.8.111.gad25c.dirty
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH net-next 0/8] etherdevice: Rename random_ether_addr to eth_random_addr
net-next commit ad7eee98be ("etherdevice: introduce eth_broadcast_addr")
added a new style API. Rename random_ether_addr to eth_random_addr to
create some API symmetry.
Joe Perches (8):
etherdevice: Rename random_ether_addr to eth_random_addr
ethernet: Use eth_random_addr
net: usb: Use eth_random_addr
wireless: Use eth_random_addr
drivers/net: Use eth_random_addr
s390: Use eth_random_addr
usb: Use eth_random_addr
arch: Use eth_random_addr
arch/blackfin/mach-bf537/boards/stamp.c |2 +-
arch/c6x/kernel/soc.c |2 +-
arch/mips/ar7/platform.c |4 ++--
arch/mips/powertv/powertv_setup.c |6 +++---
arch/um/drivers/net_kern.c|2 +-
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c |2 +-
drivers/net/ethernet/atheros/atlx/atl1.c |2 +-
drivers/net/ethernet/atheros/atlx/atl2.c |2 +-
drivers/net/ethernet/ethoc.c |2 +-
drivers/net/ethernet/intel/igb/igb_main.c |4 ++--
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c|2 +-
drivers/net/ethernet/lantiq_etop.c|2 +-
drivers/net/ethernet/micrel/ks8851.c |2 +-
drivers/net/ethernet/micrel/ks8851_mll.c |2 +-
drivers/net/ethernet/smsc/smsc911x.c |2 +-
drivers/net/ethernet/ti/cpsw.c|2 +-
drivers/net/ethernet/tile/tilegx.c|2 +-
drivers/net/ethernet/wiznet/w5100.c |2 +-
drivers/net/ethernet/wiznet/w5300.c |2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c |2 +-
drivers/net/tun.c |2 +-
drivers/net/usb/smsc75xx.c|2 +-
drivers/net/usb/smsc95xx.c|2 +-
drivers/net/usb/usbnet.c |2 +-
drivers/net/wimax/i2400m/driver.c |2 +-
drivers/net/wireless/adm8211.c|2 +-
drivers/net/wireless/p54/eeprom.c |2 +-
drivers/net/wireless/rt2x00/rt2400pci.c |2 +-
drivers/net/wireless/rt2x00/rt2500pci.c |2 +-
drivers/net/wireless/rt2x00/rt2500usb.c |2 +-
drivers/net/wireless/rt2x00/rt2800lib.c |2 +-
drivers/net/wireless/rt2x00/rt61pci.c |2 +-
drivers/net/wireless/rt2x00/rt73usb.c |2 +-
drivers/net/wireless/rtl818x/rtl8180/dev.c|2 +-
drivers/net/wireless/rtl818x/rtl8187/dev.c|2 +-
drivers/s390/net/qeth_l2_main.c |2 +-
drivers/s390/net/qeth_l3_main.c |2 +-
drivers/usb/atm/xusbatm.c |4 ++--
drivers/usb/gadget/u_ether.c |2 +-
include/linux/etherdevice.h | 14 --
40 files changed, 52 insertions(+), 50 deletions(-)
--
1.7.8.111.gad25c.dirty
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] Regression: Spurious "^A" in UML output
On Thu, 2012-08-16 at 15:17 +0200, Geert Uytterhoeven wrote:
> In v3.6-rc1 UML, I see spurious "^A" (ASCII 1, SOH) characters in some kernel
> messages:
>
> Calibrating delay loop... 4640.76 BogoMIPS (lpj=23203840)
> pid_max: default: 32768 minimum: 301
> Mount-cache hash table entries: 256
> ^AChecking that host ptys support output SIGIO...Yes
> ^AChecking that host ptys support SIGIO on close...No, enabling workaround
> ^AUsing 2.6 host AIO
> NET: Registered protocol family 16
> bio: create slab at 0
> Switching to clocksource itimer
>
> This happens for all output using the "printk(UM_KERN_XXX ...)" idiom.
Were these emitted with "KERN_" string constants
before this change (not <[0-7]>", but the string text
KERN_INFO, KERN_WARNING, etc...)?
> The "UM_KERN_XXX" defines are generated from the KERN_XXX defines in
> arch/um/include/shared/common-offsets.h using:
>
> DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
[]
> I.e. only the SOH character is retained in the actual define, the remainder
> ends
> up in the comment.
>
> Apparently the combo of DEFINE_STR() in
> arch/x86/um/shared/sysdep/kernel-offsets.h
> and sed-y in Kbuild doesn't support string constants consisting of
> multiple parts.
>
> A quick fix is the (whitespace-damaged) patch below, but this would reduce
> readability. And I'm afraid my sed-foo is not good enough to fix it better.
> Any takers?
Perhaps it's better to change the um STR macro instead
$ git grep -w DEFINE_STR
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_ERR, KERN_ERR);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_WARNING,
KERN_WARNING);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_INFO, KERN_INFO);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
arch/um/include/shared/common-offsets.h:DEFINE_STR(UM_KERN_CONT, KERN_CONT);
arch/x86/um/shared/sysdep/kernel-offsets.h:#define DEFINE_STR(sym, val) asm
volatile("\n->" #sym " " STR(val) " " #val: : )
$ git grep -w STR arch/x86/um/shared/
arch/x86/um/shared/sysdep/kernel-offsets.h:#define STR(x) #x
arch/x86/um/shared/sysdep/kernel-offsets.h:#define DEFINE_STR(sym, val) asm
volatile("\n->" #sym " " STR(val) " " #val: : )
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [PATCH/RFC] um: Preinclude include/linux/kern_levels.h
On Sun, 2012-09-09 at 10:33 +0200, Geert Uytterhoeven wrote:
> Ping?
Richard? Are you going to pick up this patch?
It seems sensible.
Geert, I suggest sending it directly to Linus as a fix
if Richard doesn't respond in a few days.
> On Thu, Aug 16, 2012 at 8:15 PM, Geert Uytterhoeven
> wrote:
> > The userspace part of UML uses the asm-offsets.h generator mechanism to
> > create definitions for UM_KERN_ that match the in-kernel
> > KERN_ constant definitions.
> >
> > As of commit 04d2c8c83d0e3ac5f78aeede51babb3236200112 ("printk: convert
> > the format for KERN_ to a 2 byte pattern"), KERN_ is no
> > longer expanded to the literal '""', but to '"\001" "LEVEL"', i.e.
> > it contains two parts.
> >
> > However, the combo of DEFINE_STR() in
> > arch/x86/um/shared/sysdep/kernel-offsets.h and sed-y in Kbuild doesn't
> > support string literals consisting of multiple parts. Hence for all
> > UM_KERN_ definitions, only the SOH character is retained in the
> > actual
> > definition, while the remainder ends up in the comment. E.g. in
> > include/generated/asm-offsets.h we get
> >
> > #define UM_KERN_INFO "\001" /* "6" KERN_INFO */
> >
> > instead of
> >
> > #define UM_KERN_INFO "\001" "6" /* KERN_INFO */
> >
> > This causes spurious '^A' output in some kernel messages:
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [PATCH 1/4] arch/um/drivers: Drop UM_ prefix from printk() level specifiers
On Sat, 2012-09-29 at 19:07 +0200, Geert Uytterhoeven wrote:
> Since commit 9429ec96c2718c0d1e3317cf60a87a0405223814 ("um: Preinclude
> include/linux/kern_levels.h") the non-prefixed printk() level specifiers
> are usable for the user parts of UML.
Thanks Geert.
--
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [PATCH 2/4] arch/um/os-Linux: Drop UM_ prefix from printk() level specifiers
On Sat, 2012-09-29 at 19:07 +0200, Geert Uytterhoeven wrote:
> Since commit 9429ec96c2718c0d1e3317cf60a87a0405223814 ("um: Preinclude
> include/linux/kern_levels.h") the non-prefixed printk() level specifiers
> are usable for the user parts of UML.
Thanks here too.
> diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
[]
> @@ -88,7 +88,7 @@ static int do_aio(aio_context_t ctx, enum aio_type type,
> int fd, char *buf,
> iocbp->aio_nbytes = sizeof(c);
> break;
> default:
> - printk(UM_KERN_ERR "Bogus op in do_aio - %d\n", type);
> + printk(KERN_ERR "Bogus op in do_aio - %d\n", type);
Maybe a follow-on patch to convert these to pr_?
--
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH net-next 00/21] treewide: Use consistent api style for address testing
ethernet, ipv4, and ipv6 address testing uses 3 different api naming styles. ethernet uses: is__ether_addr ipv4 uses: ipv4_is_ ipv6 uses: ipv6_addr_ Standardize on the ipv6 style of _addr_ to reduce the number of styles to remember. The new consistent styles are: eth_addr_(const u8 *) ipv4_addr_(__be32) ipv6_addr_(const struct in6_addr *) Add temporary backward compatibility #defines for the old names too. Joe Perches (21): etherdevice: Rename is__ether_addr tests to eth_addr_ net: Convert is__ether_addr uses to eth_addr_ arch: Convert is__ether_addr uses to eth_addr_ wireless: Convert is__ether_addr uses to eth_addr_ drivers: net: Convert is__ether_addr uses to eth_addr_ staging: Convert is__ether_addr uses to eth_addr_ infiniband: Convert is__ether_addr uses to eth_addr_ scsi: Convert is__ether_addr uses to eth_addr_ of: Convert is__ether_addr uses to eth_addr_ s390: Convert is__ether_addr uses to eth_addr_ usb: Convert is__ether_addr uses to eth_addr_ uwb: Convert is__ether_addr uses to eth_addr_ Documentation: networking: Convert is__ether_addr uses to eth_addr_ llc_if.h: Convert is__ether_addr uses to eth_addr_ in.h: Rename ipv4_is_ functions to ipv4_addr_ net: Convert ipv4_is_ uses to ipv4_addr_ infiniband: Convert ipv4_is_ uses to ipv4_addr_ ath6kl: Convert ipv4_is_ uses to ipv4_addr_ parisc: Convert ipv4_is_ uses to ipv4_addr_ lockd: Convert ipv4_is_ uses to ipv4_addr_ sctp: Convert ipv4_is_ uses to ipv4_addr_ Documentation/networking/driver.txt|2 +- arch/arm/mach-davinci/board-mityomapl138.c |2 +- arch/arm/mach-pxa/colibri-pxa3xx.c |2 +- arch/avr32/boards/atngw100/setup.c |2 +- arch/avr32/boards/atstk1000/atstk1002.c|2 +- arch/avr32/boards/favr-32/setup.c |2 +- arch/avr32/boards/hammerhead/setup.c |2 +- arch/avr32/boards/merisc/setup.c |2 +- arch/avr32/boards/mimc200/setup.c |2 +- arch/mips/alchemy/common/platform.c|4 +- arch/um/drivers/net_kern.c |6 +- drivers/infiniband/core/cma.c |4 +- drivers/infiniband/hw/amso1100/c2.c|2 +- drivers/infiniband/hw/nes/nes_nic.c|2 +- drivers/net/bonding/bond_3ad.c |2 +- drivers/net/bonding/bond_alb.c |2 +- drivers/net/bonding/bond_main.c|6 +- drivers/net/dummy.c|2 +- drivers/net/ethernet/3com/3c59x.c |2 +- drivers/net/ethernet/3com/typhoon.c|2 +- drivers/net/ethernet/8390/etherh.c |2 +- drivers/net/ethernet/adi/bfin_mac.c|6 +- drivers/net/ethernet/aeroflex/greth.c |4 +- drivers/net/ethernet/amd/au1000_eth.c |2 +- drivers/net/ethernet/amd/depca.c |4 +- drivers/net/ethernet/amd/pcnet32.c |8 ++-- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c |2 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c|2 +- drivers/net/ethernet/atheros/atl1e/atl1e_hw.c |4 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c|2 +- drivers/net/ethernet/atheros/atlx/atl1.c | 10 ++-- drivers/net/ethernet/atheros/atlx/atl2.c | 14 +++--- drivers/net/ethernet/atheros/atlx/atlx.c |2 +- drivers/net/ethernet/broadcom/b44.c|4 +- drivers/net/ethernet/broadcom/bnx2.c |2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c|6 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h|4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c |6 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c |2 +- drivers/net/ethernet/broadcom/cnic.c |2 +- drivers/net/ethernet/broadcom/tg3.c|6 +- drivers/net/ethernet/brocade/bna/bnad.c|6 +- drivers/net/ethernet/cadence/at91_ether.c |6 +- drivers/net/ethernet/cadence/macb.c|4 +- drivers/net/ethernet/calxeda/xgmac.c |6 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c|2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c|2 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c|2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c |2 +- drivers/net/ethernet/cirrus/mac89x0.c |2 +- drivers/net/ethernet/cisco/enic/enic_dev.c |4 +- drivers/net/ethernet/cisco/enic/enic_main.c| 10 ++-- drivers/net/ethernet/cisco/enic/enic_pp.c | 10 ++-- drivers/net/ethernet/davicom/dm9000.c |6 +- drivers/net/ethernet/dec/ewrk3.c |4 +- drivers/net/ethernet/dec/tulip/de4x5.c |4 +- drivers/net
[uml-devel] [PATCH net-next 03/21] arch: Convert is__ether_addr uses to eth_addr_
Convert the old ether_addr tests to eth_addr_.
Adds api consistency.
Signed-off-by: Joe Perches
---
arch/arm/mach-davinci/board-mityomapl138.c |2 +-
arch/arm/mach-pxa/colibri-pxa3xx.c |2 +-
arch/avr32/boards/atngw100/setup.c |2 +-
arch/avr32/boards/atstk1000/atstk1002.c|2 +-
arch/avr32/boards/favr-32/setup.c |2 +-
arch/avr32/boards/hammerhead/setup.c |2 +-
arch/avr32/boards/merisc/setup.c |2 +-
arch/avr32/boards/mimc200/setup.c |2 +-
arch/mips/alchemy/common/platform.c|4 ++--
arch/um/drivers/net_kern.c |6 +++---
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c
b/arch/arm/mach-davinci/board-mityomapl138.c
index 43e4a0d..df45c9c 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -138,7 +138,7 @@ static void read_factory_config(struct memory_accessor *a,
void *context)
}
pr_info("MityOMAPL138: Found MAC = %pM\n", factory_config.mac);
- if (is_valid_ether_addr(factory_config.mac))
+ if (eth_addr_valid(factory_config.mac))
memcpy(soc_info->emac_pdata->mac_addr,
factory_config.mac, ETH_ALEN);
else
diff --git a/arch/arm/mach-pxa/colibri-pxa3xx.c
b/arch/arm/mach-pxa/colibri-pxa3xx.c
index 8240291..839040c 100644
--- a/arch/arm/mach-pxa/colibri-pxa3xx.c
+++ b/arch/arm/mach-pxa/colibri-pxa3xx.c
@@ -52,7 +52,7 @@ void __init colibri_pxa3xx_init_eth(struct ax_plat_data
*plat_data)
serial >>= 8;
}
- if (is_valid_ether_addr(ether_mac_addr)) {
+ if (eth_addr_valid(ether_mac_addr)) {
plat_data->flags |= AXFLG_MAC_FROMPLATFORM;
plat_data->mac_addr = ether_mac_addr;
printk(KERN_INFO "%s(): taking MAC from serial boot tag\n",
diff --git a/arch/avr32/boards/atngw100/setup.c
b/arch/avr32/boards/atngw100/setup.c
index afeae89..5f7d86d 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -175,7 +175,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
return;
addr = hw_addr[pdev->id].addr;
- if (!is_valid_ether_addr(addr))
+ if (!eth_addr_valid(addr))
return;
/*
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c
b/arch/avr32/boards/atstk1000/atstk1002.c
index 6c80aba..7334686 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -189,7 +189,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
return;
addr = hw_addr[pdev->id].addr;
- if (!is_valid_ether_addr(addr))
+ if (!eth_addr_valid(addr))
return;
/*
diff --git a/arch/avr32/boards/favr-32/setup.c
b/arch/avr32/boards/favr-32/setup.c
index 27bd6fb..0b76aa7 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -196,7 +196,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
return;
addr = hw_addr[pdev->id].addr;
- if (!is_valid_ether_addr(addr))
+ if (!eth_addr_valid(addr))
return;
/*
diff --git a/arch/avr32/boards/hammerhead/setup.c
b/arch/avr32/boards/hammerhead/setup.c
index 9d1efd1..d64fa9f 100644
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -139,7 +139,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
addr = hw_addr[pdev->id].addr;
- if (!is_valid_ether_addr(addr))
+ if (!eth_addr_valid(addr))
return;
/*
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index ed137e3..817d2d8 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -129,7 +129,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
return;
addr = hw_addr[pdev->id].addr;
- if (!is_valid_ether_addr(addr))
+ if (!eth_addr_valid(addr))
return;
regs = (void __iomem __force *)res->start;
diff --git a/arch/avr32/boards/mimc200/setup.c
b/arch/avr32/boards/mimc200/setup.c
index 05358aa..31cd87e 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -152,7 +152,7 @@ static void __init set_hw_addr(struct platform_device *pdev)
return;
addr = hw_addr[pdev->id].addr;
- if (!is_valid_ether_addr(addr))
+ if (!eth_addr_valid(addr))
return;
/*
diff --git a/arch/mips/alchemy/common/platform.c
b/arch/mips/alchemy/common/platform.c
index c0f3ce6..5f07da3 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -343,
[uml-devel] [PATCH] wanrouter: Remove it and the drivers that depend on it
Remove wanrouter as it's obsolete and has not been updated by sangoma since 2.4.3 or so and it's not used anymore. Remove obsolete cyclomx drivers. Update defconfig files that enable wanrouter. Update files that include now deleted wanrouter bits. Signed-off-by: Joe Perches --- Documentation/ioctl/ioctl-number.txt |1 - Documentation/magic-number.txt |1 - Documentation/zh_CN/magic-number.txt |1 - arch/arm/configs/ixp4xx_defconfig |2 - arch/mips/configs/gpr_defconfig|3 - arch/mips/configs/mtx1_defconfig |3 - arch/mips/configs/nlm_xlp_defconfig|1 - arch/mips/configs/nlm_xlr_defconfig|1 - arch/powerpc/configs/86xx/gef_sbc610_defconfig |1 - arch/powerpc/configs/86xx/sbc8641d_defconfig |1 - arch/powerpc/configs/ppc6xx_defconfig |1 - arch/um/defconfig |1 - arch/xtensa/configs/common_defconfig |1 - arch/xtensa/configs/iss_defconfig |1 - arch/xtensa/configs/s6105_defconfig|1 - drivers/isdn/i4l/isdn_x25iface.c |1 - drivers/isdn/i4l/isdn_x25iface.h |1 - drivers/net/wan/Kconfig| 54 - drivers/net/wan/Makefile |5 - drivers/net/wan/cycx_drv.c | 569 - drivers/net/wan/cycx_main.c| 346 - drivers/net/wan/cycx_x25.c | 1602 include/linux/cyclomx.h| 77 -- include/linux/cycx_drv.h | 64 - include/linux/wanrouter.h | 129 -- include/uapi/linux/Kbuild |1 - include/uapi/linux/wanrouter.h | 452 --- net/Kconfig|1 - net/Makefile |1 - net/socket.c |1 - net/wanrouter/Kconfig | 27 - net/wanrouter/Makefile |7 - net/wanrouter/patchlevel |1 - net/wanrouter/wanmain.c| 782 net/wanrouter/wanproc.c| 380 -- 35 files changed, 0 insertions(+), 4521 deletions(-) delete mode 100644 drivers/net/wan/cycx_drv.c delete mode 100644 drivers/net/wan/cycx_main.c delete mode 100644 drivers/net/wan/cycx_x25.c delete mode 100644 include/linux/cyclomx.h delete mode 100644 include/linux/cycx_drv.h delete mode 100644 include/linux/wanrouter.h delete mode 100644 include/uapi/linux/wanrouter.h delete mode 100644 net/wanrouter/Kconfig delete mode 100644 net/wanrouter/Makefile delete mode 100644 net/wanrouter/patchlevel delete mode 100644 net/wanrouter/wanmain.c delete mode 100644 net/wanrouter/wanproc.c diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 2152b0e..028a034 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -179,7 +179,6 @@ Code Seq#(hex) Include FileComments 'V'C0 media/davinci/vpfe_capture.hconflict! 'V'C0 media/si4713.h conflict! 'W'00-1F linux/watchdog.hconflict! -'W'00-1F linux/wanrouter.h conflict! 'W'00-3F sound/asound.h conflict! 'X'all fs/xfs/xfs_fs.h conflict! and fs/xfs/linux-2.6/xfs_ioctl32.h diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt index 82761a3..0c39e72 100644 --- a/Documentation/magic-number.txt +++ b/Documentation/magic-number.txt @@ -122,7 +122,6 @@ SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c TRIDENT_CARD_MAGIC0x5072696E trident_card sound/oss/trident.c -ROUTER_MAGIC 0x524d4157 wan_deviceinclude/linux/wanrouter.h SCC_MAGIC 0x52696368 gs_port drivers/char/scc.h SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c GDA_MAGIC 0x58464552 gda arch/mips/include/asm/sn/gda.h diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt index 4263022..51b7e15 100644 --- a/Documentation/zh_CN/magic-number.txt +++ b/Documentation/zh_CN/magic-number.txt @@ -122,7 +122,6 @@ SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c TRIDENT_CARD_MAGIC0x5072696E trident_card sound/oss/trident.c -ROUTER_MAGIC
Re: [uml-devel] [PATCH V2] wanrouter: Remove it and the drivers that depend on it
On Tue, 2012-11-13 at 17:17 -0500, David Miller wrote:
> From: Joe Perches
> Date: Tue, 13 Nov 2012 12:17:25 -0800
>
> > That seems an odd workflow as it leaves dangling CONFIG_
> > options set, but I guess it doesn't hurt so here it is.
>
> As you said it's harmless, and more importantly it avoids
> unnecessary conflicts.
>
> > I just removed the modified arch/.../defconfig files.
>
> Something is not right here:
> [davem@drr net-next]$ git am --signoff
> V2-wanrouter-Remove-it-and-the-drivers-that-depend-on-it.patch
> Applying: wanrouter: Remove it and the drivers that depend on it
> error: removal patch leaves file contents
> error: net/wanrouter/Kconfig: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/Makefile: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/patchlevel: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/wanmain.c: patch does not apply
> error: removal patch leaves file contents
> error: net/wanrouter/wanproc.c: patch does not apply
> error: removal patch leaves file contents
> error: drivers/net/wan/cycx_drv.c: patch does not apply
> error: removal patch leaves file contents
> error: drivers/net/wan/cycx_main.c: patch does not apply
> error: removal patch leaves file contents
> error: drivers/net/wan/cycx_x25.c: patch does not apply
> error: removal patch leaves file contents
> error: include/linux/cyclomx.h: patch does not apply
> error: removal patch leaves file contents
> error: include/linux/cycx_drv.h: patch does not apply
> error: removal patch leaves file contents
> error: include/linux/wanrouter.h: patch does not apply
> error: removal patch leaves file contents
> error: include/uapi/linux/wanrouter.h: patch does not apply
Right, that is unexpected/odd/interesting.
I was trying to save mailing list bandwidth by reducing
the patch size.
I generated this with
$ git format-patch -M -D
but it doesn't apply here either. :(
Using
$ git format-patch -M
does apply correctly.
It's quite a bit larger though. (120KB vs 14)
I'll send the large patch just to netdev.
Joe
--
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH V2] wanrouter: Remove it and the drivers that depend on it
Remove wanrouter as it's obsolete and has not been updated by sangoma since 2.4.3 or so and it's not used anymore. Remove obsolete cyclomx drivers. Update files that include now deleted wanrouter bits. Signed-off-by: Joe Perches --- On Tue, 2012-11-13 at 14:44 -0500, David Miller wrote: > Remove wanrouter as it's obsolete and has not been updated > > by sangoma since 2.4.3 or so and it's not used anymore. > > > > Remove obsolete cyclomx drivers. > > Update defconfig files that enable wanrouter. > > Update files that include now deleted wanrouter bits. > [] > I'm fine with this change, except the arch defconfig bits. > > We've been leaving those alone, and letting the arch maintainers > do the updates themselves periodically. > > Please resubmit this with those parts removed. That seems an odd workflow as it leaves dangling CONFIG_ options set, but I guess it doesn't hurt so here it is. I just removed the modified arch/.../defconfig files. Documentation/ioctl/ioctl-number.txt |1 - Documentation/magic-number.txt |1 - Documentation/zh_CN/magic-number.txt |1 - drivers/isdn/i4l/isdn_x25iface.c |1 - drivers/isdn/i4l/isdn_x25iface.h |1 - drivers/net/wan/Kconfig | 54 -- drivers/net/wan/Makefile |5 - drivers/net/wan/cycx_drv.c | 569 drivers/net/wan/cycx_main.c | 346 drivers/net/wan/cycx_x25.c | 1602 -- include/linux/cyclomx.h | 77 -- include/linux/cycx_drv.h | 64 -- include/linux/wanrouter.h| 129 --- include/uapi/linux/Kbuild|1 - include/uapi/linux/wanrouter.h | 452 -- net/Kconfig |1 - net/Makefile |1 - net/socket.c |1 - net/wanrouter/Kconfig| 27 - net/wanrouter/Makefile |7 - net/wanrouter/patchlevel |1 - net/wanrouter/wanmain.c | 782 - net/wanrouter/wanproc.c | 380 23 files changed, 0 insertions(+), 4504 deletions(-) delete mode 100644 drivers/net/wan/cycx_drv.c delete mode 100644 drivers/net/wan/cycx_main.c delete mode 100644 drivers/net/wan/cycx_x25.c delete mode 100644 include/linux/cyclomx.h delete mode 100644 include/linux/cycx_drv.h delete mode 100644 include/linux/wanrouter.h delete mode 100644 include/uapi/linux/wanrouter.h delete mode 100644 net/wanrouter/Kconfig delete mode 100644 net/wanrouter/Makefile delete mode 100644 net/wanrouter/patchlevel delete mode 100644 net/wanrouter/wanmain.c delete mode 100644 net/wanrouter/wanproc.c diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 2152b0e..028a034 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -179,7 +179,6 @@ Code Seq#(hex) Include FileComments 'V'C0 media/davinci/vpfe_capture.hconflict! 'V'C0 media/si4713.h conflict! 'W'00-1F linux/watchdog.hconflict! -'W'00-1F linux/wanrouter.h conflict! 'W'00-3F sound/asound.h conflict! 'X'all fs/xfs/xfs_fs.h conflict! and fs/xfs/linux-2.6/xfs_ioctl32.h diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt index 82761a3..0c39e72 100644 --- a/Documentation/magic-number.txt +++ b/Documentation/magic-number.txt @@ -122,7 +122,6 @@ SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c TRIDENT_CARD_MAGIC0x5072696E trident_card sound/oss/trident.c -ROUTER_MAGIC 0x524d4157 wan_deviceinclude/linux/wanrouter.h SCC_MAGIC 0x52696368 gs_port drivers/char/scc.h SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c GDA_MAGIC 0x58464552 gda arch/mips/include/asm/sn/gda.h diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt index 4263022..51b7e15 100644 --- a/Documentation/zh_CN/magic-number.txt +++ b/Documentation/zh_CN/magic-number.txt @@ -122,7 +122,6 @@ SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c TRIDENT_CARD_MAGIC0x5072696E trident_card sound/oss/trident.c -ROUTER_MAGIC 0x524d4157 wan_deviceinclude/linux/wanrouter.h SCC_MAGIC 0x52696368 gs_port drivers/char/scc.h SAV
[uml-devel] [TRIVIAL PATCH 14/26] um: Convert print_symbol to %pSR
Use the new vsprintf extension to avoid any possible
message interleaving.
Signed-off-by: Joe Perches
---
arch/um/kernel/sysrq.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index e562ff8..6fa632c 100644
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -24,10 +24,8 @@ void show_trace(struct task_struct *task, unsigned long *
stack)
while (((long) stack & (THREAD_SIZE-1)) != 0) {
addr = *stack;
if (__kernel_text_address(addr)) {
- printk(KERN_INFO "%08lx: [<%08lx>]",
- (unsigned long) stack, addr);
- print_symbol(KERN_CONT " %s", addr);
- printk(KERN_CONT "\n");
+ printk(KERN_INFO "%08lx: [<%08lx>] %pSR\n",
+ (unsigned long)stack, addr, (void *)addr);
}
stack++;
}
--
1.7.8.112.g3fd21
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [TRIVIAL PATCH 16/26] x86: Convert print_symbol to %pSR
Use the new vsprintf extension to avoid any possible
message interleaving.
Signed-off-by: Joe Perches
---
arch/x86/kernel/cpu/mcheck/mce.c | 13 +++--
arch/x86/kernel/dumpstack.c |5 ++---
arch/x86/kernel/process_32.c |2 +-
arch/x86/mm/mmio-mod.c |4 ++--
arch/x86/um/sysrq_32.c |9 +++--
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 80dbda8..996f98a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -242,13 +242,14 @@ static void print_mce(struct mce *m)
m->extcpu, m->mcgstatus, m->bank, m->status);
if (m->ip) {
- pr_emerg(HW_ERR "RIP%s %02x:<%016Lx> ",
- !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
- m->cs, m->ip);
-
if (m->cs == __KERNEL_CS)
- print_symbol("{%s}", m->ip);
- pr_cont("\n");
+ pr_emerg(HW_ERR "RIP%s %02x:<%016Lx> {%pSR}\n",
+!(m->mcgstatus & MCG_STATUS_EIPV) ? "
!INEXACT!" : "",
+m->cs, m->ip, (void *)m->ip);
+ else
+ pr_emerg(HW_ERR "RIP%s %02x:<%016Lx>\n",
+!(m->mcgstatus & MCG_STATUS_EIPV) ? "
!INEXACT!" : "",
+m->cs, m->ip);
}
pr_emerg(HW_ERR "TSC %llx ", m->tsc);
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index ae42418b..b6e5bdb 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -281,9 +281,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs,
long err)
sp = kernel_stack_pointer(regs);
savesegment(ss, ss);
}
- printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);
- print_symbol("%s", regs->ip);
- printk(" SS:ESP %04x:%08lx\n", ss, sp);
+ printk(KERN_EMERG "EIP: [<%08lx>] %pSR SS:ESP %04x:%08lx\n",
+ regs->ip, (void *)regs->ip, ss, sp);
#else
/* Executive summary in case the oops scrolled away */
printk(KERN_ALERT "RIP ");
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index b5a8905..0db77e0 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -89,7 +89,7 @@ void __show_regs(struct pt_regs *regs, int all)
printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
(u16)regs->cs, regs->ip, regs->flags,
smp_processor_id());
- print_symbol("EIP is at %s\n", regs->ip);
+ printk(KERN_DEFAULT "EIP is at %pSR\n", (void *)regs->ip);
printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
regs->ax, regs->bx, regs->cx, regs->dx);
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index dc0b727..c0ca484 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -123,8 +123,8 @@ static void die_kmmio_nesting_error(struct pt_regs *regs,
unsigned long addr)
pr_emerg("unexpected fault for address: 0x%08lx, last fault for
address: 0x%08lx\n",
addr, my_reason->addr);
print_pte(addr);
- print_symbol(KERN_EMERG "faulting IP is at %s\n", regs->ip);
- print_symbol(KERN_EMERG "last faulting IP was at %s\n", my_reason->ip);
+ pr_emerg("faulting IP is at %pSR\n", (void *)regs->ip);
+ pr_emerg("last faulting IP was at %pSR\n", (void *)my_reason->ip);
#ifdef __i386__
pr_emerg("eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n",
regs->ax, regs->bx, regs->cx, regs->dx);
diff --git a/arch/x86/um/sysrq_32.c b/arch/x86/um/sysrq_32.c
index c9bee5b..30b4200 100644
--- a/arch/x86/um/sysrq_32.c
+++ b/arch/x86/um/sysrq_32.c
@@ -50,18 +50,15 @@ static inline unsigned long print_context_stack(struct
thread_info *tinfo,
#ifdef CONFIG_FRAME_POINTER
while (valid_stack_ptr(tinfo, (void *)ebp)) {
addr = *(unsigned long *)(ebp + 4);
- printk("%08lx: [<%08lx>]", ebp + 4, addr);
- print_symbol(" %s", addr);
- printk("\n");
+ printk("%08lx: [<%08lx>] %pSR\n", ebp + 4, addr, (void *)addr);
ebp = *(unsigned long *)ebp;
}
#else
while (val
[uml-devel] [TRIVIAL PATCH 00/26] treewide: Add and use vsprintf extension %pSR
Remove the somewhat awkward uses of print_symbol and convert all the
existing uses to a new vsprintf pointer type of %pSR.
print_symbol can be interleaved when it is used in a sequence like:
printk("something: ...");
print_symbol("%s", addr);
printk("\n");
Instead use:
printk("something: %pSR\n", (void *)addr);
Add a new %p[SsFf]R vsprintf extension that can perform the same
symbol function/address/offset formatting as print_symbol to
reduce the number and styles of message logging functions.
print_symbol used __builtin_extract_return_addr for those architectures
like S/390 and SPARC that have offset or masked addressing.
%p[FfSs]R uses the same gcc __builtin
Joe Perches (26):
vsprintf: Add extension %pSR - print_symbol replacement
alpha: Convert print_symbol to %pSR
arm: Convert print_symbol to %pSR
arm64: Convert print_symbol to %pSR
avr32: Convert print_symbol to %pSR
c6x: Convert print_symbol to %pSR
ia64: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
mn10300: Convert print_symbol to %pSR
openrisc: Convert print_symbol to %pSR
powerpc: Convert print_symbol to %pSR
s390: Convert print_symbol to %pSR
sh: Convert print_symbol to %pSR
um: Convert print_symbol to %pSR
unicore32: Convert print_symbol to %pSR
x86: Convert print_symbol to %pSR
xtensa: Convert print_symbol to %pSR
drivers: base: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
sysfs: Convert print_symbol to %pSR
irq: Convert print_symbol to %pSR
smp_processor_id: Convert print_symbol to %pSR
mm: Convert print_symbol to %pSR
xtensa: Convert print_symbol to %pSR
x86: head_64.S: Use vsprintf extension %pSR not print_symbol
kallsyms: Remove print_symbol
Documentation/filesystems/sysfs.txt |4 +-
Documentation/printk-formats.txt|2 +
Documentation/zh_CN/filesystems/sysfs.txt |4 +-
arch/alpha/kernel/traps.c |8 ++
arch/arm/kernel/process.c |4 +-
arch/arm64/kernel/process.c |4 +-
arch/avr32/kernel/process.c | 25 ++-
arch/c6x/kernel/traps.c |3 +-
arch/ia64/kernel/process.c | 13 ---
arch/m32r/kernel/traps.c|6 +---
arch/mn10300/kernel/traps.c |8 +++---
arch/openrisc/kernel/traps.c|7 +
arch/powerpc/platforms/cell/spu_callbacks.c | 12 --
arch/s390/kernel/traps.c| 28 +++---
arch/sh/kernel/process_32.c |4 +-
arch/um/kernel/sysrq.c |6 +---
arch/unicore32/kernel/process.c |5 ++-
arch/x86/kernel/cpu/mcheck/mce.c| 13 ++-
arch/x86/kernel/dumpstack.c |5 +--
arch/x86/kernel/head_64.S |4 +-
arch/x86/kernel/process_32.c|2 +-
arch/x86/mm/mmio-mod.c |4 +-
arch/x86/um/sysrq_32.c |9 ++-
arch/xtensa/kernel/traps.c |6 +---
drivers/base/core.c |4 +-
fs/gfs2/glock.c |4 +-
fs/gfs2/trans.c |3 +-
fs/sysfs/file.c |4 +-
include/linux/kallsyms.h| 18 -
kernel/irq/debug.h | 15 ++---
kernel/kallsyms.c | 11 --
lib/smp_processor_id.c |2 +-
lib/vsprintf.c | 18
mm/memory.c |8 +++---
mm/slab.c |8 ++
35 files changed, 117 insertions(+), 164 deletions(-)
--
1.7.8.112.g3fd21
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [TRIVIAL PATCH 16/26] x86: Convert print_symbol to %pSR
On Wed, 2012-12-12 at 21:49 +, Luck, Tony wrote: > > I think I'd go ahead and ACK this unless Tony has some comments. I'm not > > happy about the two pr_emerg calls based on the conditional. > > As written the patch has the nice property of not making any changes to the > console output (except to eliminate the possibility of interleaved output that > the original code had). Well, it does eliminate a trailing space when m->cs != KERNEL_CS. That probably won't hurt anything, but... -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [TRIVIAL PATCH 16/26] x86: Convert print_symbol to %pSR
On Wed, 2012-12-12 at 22:09 +0100, Borislav Petkov wrote:
> On Wed, Dec 12, 2012 at 10:19:05AM -0800, Joe Perches wrote:
> > Use the new vsprintf extension to avoid any possible
> > message interleaving.
[]
> > diff --git a/arch/x86/kernel/cpu/mcheck/mce.c
> > b/arch/x86/kernel/cpu/mcheck/mce.c
[]
> > @@ -242,13 +242,14 @@ static void print_mce(struct mce *m)
> >m->extcpu, m->mcgstatus, m->bank, m->status);
> >
> > if (m->ip) {
> > - pr_emerg(HW_ERR "RIP%s %02x:<%016Lx> ",
> > - !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
> > - m->cs, m->ip);
> > -
> > if (m->cs == __KERNEL_CS)
> > - print_symbol("{%s}", m->ip);
> > - pr_cont("\n");
> > + pr_emerg(HW_ERR "RIP%s %02x:<%016Lx> {%pSR}\n",
> > +!(m->mcgstatus & MCG_STATUS_EIPV) ? "
> > !INEXACT!" : "",
> > +m->cs, m->ip, (void *)m->ip);
> > + else
> > + pr_emerg(HW_ERR "RIP%s %02x:<%016Lx>\n",
> > +!(m->mcgstatus & MCG_STATUS_EIPV) ? "
> > !INEXACT!" : "",
> > +m->cs, m->ip);
> > }
>
> I think I'd go ahead and ACK this unless Tony has some comments. I'm not
> happy about the two pr_emerg calls based on the conditional.
It was done to avoid interleaving.
> Or, Tony, what do you think, could we get away if we printed empty
> string for when m->cs != __KERNEL_CS? I'm thinking of not breaking any
> userspace which is parsing that output and seeing "... {}" in that case.
>
> This assumes that vsprintf can print (void *)0 when passed as an
> argument through %pSR. Joe?
Definitely yes when not #defined CONFIG_KALLSYMS
I believe no object exists at address 0 for all
arches so I believe yes for CONFIG_KALLSYMS too,
My preference is to eventually do away with all the
"[%0(size)lx] %pSR", addr, (void *)addr
uses and create another %pSx that emits the pointer
address and the function/offset in one go in a
standardized style without caring about the pointer
size.
Something like:
"%pSp", (void *)addr
would emit
[<7def0123>] function_name+offset/size
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [TRIVIAL PATCH V2 16/26] x86: Convert print_symbol to %pSR
Use the new vsprintf extension to avoid any possible
message interleaving.
Signed-off-by: Joe Perches
Acked-by: Tony Luck
Acked-by: Borislav Petkov
---
V2: mce.c: Add cast to (unsigned long) before cast to (void *)
to quiet the compiler on x86-32
arch/x86/kernel/cpu/mcheck/mce.c | 13 +++--
arch/x86/kernel/dumpstack.c |5 ++---
arch/x86/kernel/process_32.c |2 +-
arch/x86/mm/mmio-mod.c |4 ++--
arch/x86/um/sysrq_32.c |9 +++--
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 80dbda8..996f98a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -242,13 +242,14 @@ static void print_mce(struct mce *m)
m->extcpu, m->mcgstatus, m->bank, m->status);
if (m->ip) {
- pr_emerg(HW_ERR "RIP%s %02x:<%016Lx> ",
- !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
- m->cs, m->ip);
-
if (m->cs == __KERNEL_CS)
- print_symbol("{%s}", m->ip);
- pr_cont("\n");
+ pr_emerg(HW_ERR "RIP%s %02x:<%016Lx> {%pSR}\n",
+!(m->mcgstatus & MCG_STATUS_EIPV) ? "
!INEXACT!" : "",
+m->cs, m->ip, (void *)(unsigned long)m->ip);
+ else
+ pr_emerg(HW_ERR "RIP%s %02x:<%016Lx>\n",
+!(m->mcgstatus & MCG_STATUS_EIPV) ? "
!INEXACT!" : "",
+m->cs, m->ip);
}
pr_emerg(HW_ERR "TSC %llx ", m->tsc);
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index ae42418b..b6e5bdb 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -281,9 +281,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs,
long err)
sp = kernel_stack_pointer(regs);
savesegment(ss, ss);
}
- printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);
- print_symbol("%s", regs->ip);
- printk(" SS:ESP %04x:%08lx\n", ss, sp);
+ printk(KERN_EMERG "EIP: [<%08lx>] %pSR SS:ESP %04x:%08lx\n",
+ regs->ip, (void *)regs->ip, ss, sp);
#else
/* Executive summary in case the oops scrolled away */
printk(KERN_ALERT "RIP ");
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index b5a8905..0db77e0 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -89,7 +89,7 @@ void __show_regs(struct pt_regs *regs, int all)
printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
(u16)regs->cs, regs->ip, regs->flags,
smp_processor_id());
- print_symbol("EIP is at %s\n", regs->ip);
+ printk(KERN_DEFAULT "EIP is at %pSR\n", (void *)regs->ip);
printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
regs->ax, regs->bx, regs->cx, regs->dx);
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index dc0b727..c0ca484 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -123,8 +123,8 @@ static void die_kmmio_nesting_error(struct pt_regs *regs,
unsigned long addr)
pr_emerg("unexpected fault for address: 0x%08lx, last fault for
address: 0x%08lx\n",
addr, my_reason->addr);
print_pte(addr);
- print_symbol(KERN_EMERG "faulting IP is at %s\n", regs->ip);
- print_symbol(KERN_EMERG "last faulting IP was at %s\n", my_reason->ip);
+ pr_emerg("faulting IP is at %pSR\n", (void *)regs->ip);
+ pr_emerg("last faulting IP was at %pSR\n", (void *)my_reason->ip);
#ifdef __i386__
pr_emerg("eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n",
regs->ax, regs->bx, regs->cx, regs->dx);
diff --git a/arch/x86/um/sysrq_32.c b/arch/x86/um/sysrq_32.c
index c9bee5b..30b4200 100644
--- a/arch/x86/um/sysrq_32.c
+++ b/arch/x86/um/sysrq_32.c
@@ -50,18 +50,15 @@ static inline unsigned long print_context_stack(struct
thread_info *tinfo,
#ifdef CONFIG_FRAME_POINTER
while (valid_stack_ptr(tinfo, (void *)ebp)) {
addr = *(unsigned long *)(ebp + 4);
- printk("%08lx: [<%08lx>]", ebp + 4, addr);
- print_symbol(" %s", addr);
- printk("\n");
+ printk(&quo
Re: [uml-devel] [TRIVIAL PATCH 16/26] x86: Convert print_symbol to %pSR
On Thu, 2012-12-13 at 19:37 +0100, Borislav Petkov wrote:
> On Thu, Dec 13, 2012 at 10:23:10AM -0800, Joe Perches wrote:
> > m->ip is a u64 so, when compiling x86-32, there's a new warning
> > "cast to pointer from integer of different size". This isn't new
> > different behavior, just a new warning. The previous print_symbol
> > took a ulong and the u64 was silently truncated.
> >
> > CC arch/x86/kernel/cpu/mcheck/mce.o
> > arch/x86/kernel/cpu/mcheck/mce.c: In function ‘print_mce’:
> > arch/x86/kernel/cpu/mcheck/mce.c:246:4: warning: cast to pointer from
> > integer of different size [-Wint-to-pointer-cast]
> >
> > If appropriate, the code could be changed to
> >
> > (void *)(unsigned long)m->ip
>
> Can we explicitly cast it to what it is so that we can be explicit as to
> what we're casting it? IOW:
>
> (void *)(__u64)m->ip;
>
> Does that even work on 32bit?
No, it already is __u64. You need (unsigned long)
or something else the same size as (void *)
from: arch/x86/include/asm/mce.h
/* Fields are zero when not available */
struct mce {
...
__u64 ip;
> Also, does the compiler bitch about this useless cast when building with
> W=123?
For x86-32:
With the cast the line is silent.
Without the cast, just the warning about cast.
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [TRIVIAL PATCH 16/26] x86: Convert print_symbol to %pSR
On Wed, 2012-12-12 at 23:45 +0100, Borislav Petkov wrote: > On Wed, Dec 12, 2012 at 02:23:59PM -0800, Joe Perches wrote: > > On Wed, 2012-12-12 at 21:49 +, Luck, Tony wrote: > > > > I think I'd go ahead and ACK this unless Tony has some comments. I'm not > > > > happy about the two pr_emerg calls based on the conditional. > > > > > > As written the patch has the nice property of not making any changes to > > > the > > > console output (except to eliminate the possibility of interleaved output > > > that > > > the original code had). > > > > Well, it does eliminate a trailing space when m->cs != KERNEL_CS. > > That probably won't hurt anything, but... > > Yeah, that won't be an issue. So let's take it as is, as Tony suggests. Hi again Boris. I should mention one more thing. m->ip is a u64 so, when compiling x86-32, there's a new warning "cast to pointer from integer of different size". This isn't new different behavior, just a new warning. The previous print_symbol took a ulong and the u64 was silently truncated. CC arch/x86/kernel/cpu/mcheck/mce.o arch/x86/kernel/cpu/mcheck/mce.c: In function ‘print_mce’: arch/x86/kernel/cpu/mcheck/mce.c:246:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] If appropriate, the code could be changed to (void *)(unsigned long)m->ip to shut the compiler up. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 2/4] UserModeLinux: Remove unused #defines of UM_KERN_
These are now unused so delete them. Signed-off-by: Joe Perches --- arch/um/include/shared/user.h | 11 --- 1 file changed, 11 deletions(-) diff --git a/arch/um/include/shared/user.h b/arch/um/include/shared/user.h index cef0685..4fa82c0 100644 --- a/arch/um/include/shared/user.h +++ b/arch/um/include/shared/user.h @@ -26,17 +26,6 @@ extern void panic(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -/* Requires preincluding include/linux/kern_levels.h */ -#define UM_KERN_EMERG KERN_EMERG -#define UM_KERN_ALERT KERN_ALERT -#define UM_KERN_CRIT KERN_CRIT -#define UM_KERN_ERRKERN_ERR -#define UM_KERN_WARNINGKERN_WARNING -#define UM_KERN_NOTICE KERN_NOTICE -#define UM_KERN_INFO KERN_INFO -#define UM_KERN_DEBUG KERN_DEBUG -#define UM_KERN_CONT KERN_CONT - #ifdef UML_CONFIG_PRINTK extern int printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); -- 1.8.1.2.459.gbcd45b4.dirty -- Is your legacy SCM system holding you back? Join Perforce May 7 to find out: • 3 signs your SCM is hindering your productivity • Requirements for releasing software faster • Expert tips and advice for migrating your SCM now http://p.sf.net/sfu/perforce ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 0/4] UserModeLinux: Message logging neatening
Joe Perches (4): UserModeLinux: Convert UM_KERN_ to KERN_ UserModeLinux: Remove unused #defines of UM_KERN_ UserModeLinux: Use a more current logging style UserModeLinux: Convert printks to pr_ arch/um/drivers/chan_kern.c | 27 +++ arch/um/drivers/chan_user.c | 47 ++-- arch/um/drivers/daemon_kern.c| 8 +- arch/um/drivers/daemon_user.c| 28 +++ arch/um/drivers/fd.c | 9 +-- arch/um/drivers/harddog_kern.c | 4 +- arch/um/drivers/harddog_user.c | 14 ++-- arch/um/drivers/hostaudio_kern.c | 13 ++-- arch/um/drivers/line.c | 24 +++--- arch/um/drivers/mconsole_kern.c | 29 +++ arch/um/drivers/mconsole_user.c | 7 +- arch/um/drivers/mmapper_kern.c | 7 +- arch/um/drivers/net_kern.c | 53 + arch/um/drivers/net_user.c | 20 ++--- arch/um/drivers/pcap_kern.c | 9 +-- arch/um/drivers/pcap_user.c | 19 +++-- arch/um/drivers/port_kern.c | 23 +++--- arch/um/drivers/port_user.c | 6 +- arch/um/drivers/pty.c| 4 +- arch/um/drivers/random.c | 3 +- arch/um/drivers/slip_kern.c | 2 +- arch/um/drivers/slip_user.c | 29 +++ arch/um/drivers/slirp_kern.c | 9 +-- arch/um/drivers/slirp_user.c | 9 +-- arch/um/drivers/ssl.c| 10 +-- arch/um/drivers/stdio_console.c | 9 +-- arch/um/drivers/tty.c| 3 +- arch/um/drivers/ubd_kern.c | 117 + arch/um/drivers/ubd_user.c | 6 +- arch/um/drivers/umcast_kern.c| 38 +- arch/um/drivers/umcast_user.c| 35 - arch/um/drivers/vde_kern.c | 23 +++--- arch/um/drivers/vde_user.c | 17 ++--- arch/um/drivers/xterm.c | 26 +++ arch/um/drivers/xterm_kern.c | 6 +- arch/um/include/asm/pgtable-2level.h | 12 +-- arch/um/include/asm/pgtable-3level.h | 18 ++--- arch/um/include/shared/user.h| 12 +-- arch/um/kernel/exec.c| 4 +- arch/um/kernel/exitcode.c| 3 +- arch/um/kernel/initrd.c | 10 +-- arch/um/kernel/irq.c | 14 ++-- arch/um/kernel/physmem.c | 16 ++-- arch/um/kernel/process.c | 2 +- arch/um/kernel/sigio.c | 4 +- arch/um/kernel/skas/mmu.c| 9 +-- arch/um/kernel/smp.c | 18 ++--- arch/um/kernel/sysrq.c | 21 +++--- arch/um/kernel/time.c| 6 +- arch/um/kernel/tlb.c | 8 +- arch/um/kernel/trap.c| 9 +-- arch/um/os-Linux/aio.c | 45 +-- arch/um/os-Linux/drivers/ethertap_kern.c | 8 +- arch/um/os-Linux/drivers/ethertap_user.c | 32 arch/um/os-Linux/drivers/tuntap_kern.c | 6 +- arch/um/os-Linux/drivers/tuntap_user.c | 24 +++--- arch/um/os-Linux/file.c | 37 - arch/um/os-Linux/helper.c| 33 arch/um/os-Linux/irq.c | 8 +- arch/um/os-Linux/process.c | 31 arch/um/os-Linux/sigio.c | 83 +--- arch/um/os-Linux/skas/mem.c | 23 +++--- arch/um/os-Linux/skas/process.c | 125 ++- arch/um/os-Linux/time.c | 3 +- arch/um/os-Linux/tty.c | 10 +-- arch/um/os-Linux/umid.c | 48 ++-- arch/x86/um/bugs_32.c| 14 ++-- arch/x86/um/os-Linux/registers.c | 2 +- 68 files changed, 605 insertions(+), 786 deletions(-) -- 1.8.1.2.459.gbcd45b4.dirty -- Is your legacy SCM system holding you back? Join Perforce May 7 to find out: • 3 signs your SCM is hindering your productivity • Requirements for releasing software faster • Expert tips and advice for migrating your SCM now http://p.sf.net/sfu/perforce ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 4/4] UserModeLinux: Convert printks to pr_
Use a more current logging style.
Convert the remaining printks without a KERN_
to pr_ where appropriate.
There a few additional printks without a level that
are emitted at KERN_DEFAULT for stack dumps and such.
Add printf format/argument verification to the static
inline just in case.
Signed-off-by: Joe Perches
---
arch/um/drivers/daemon_kern.c| 5 ++---
arch/um/drivers/harddog_kern.c | 4 +---
arch/um/drivers/harddog_user.c | 14 +++---
arch/um/drivers/pcap_kern.c | 2 +-
arch/um/drivers/random.c | 3 +--
arch/um/drivers/slip_kern.c | 2 +-
arch/um/drivers/slirp_kern.c | 6 +++---
arch/um/drivers/ubd_kern.c | 35 +--
arch/um/drivers/ubd_user.c | 6 +++---
arch/um/drivers/vde_kern.c | 6 +++---
arch/um/drivers/vde_user.c | 3 +--
arch/um/include/asm/pgtable-2level.h | 12 ++--
arch/um/include/asm/pgtable-3level.h | 18 +-
arch/um/include/shared/user.h| 1 +
14 files changed, 56 insertions(+), 61 deletions(-)
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index 197b670..ce915b8 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -34,9 +34,8 @@ static void daemon_init(struct net_device *dev, void *data)
dpri->data_addr = NULL;
dpri->local_addr = NULL;
- printk("daemon backend (uml_switch version %d) - %s:%s",
- SWITCH_VERSION, dpri->sock_type, dpri->ctl_sock);
- printk("\n");
+ pr_info("daemon backend (uml_switch version %d) - %s:%s\n",
+ SWITCH_VERSION, dpri->sock_type, dpri->ctl_sock);
}
static int daemon_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index 2d0266d..86ad99d 100644
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -176,8 +176,6 @@ static struct miscdevice harddog_miscdev = {
.fops = &harddog_fops,
};
-static char banner[] __initdata = KERN_INFO "UML Watchdog Timer\n";
-
static int __init harddog_init(void)
{
int ret;
@@ -187,7 +185,7 @@ static int __init harddog_init(void)
if (ret)
return ret;
- printk(banner);
+ pr_info("UML Watchdog Timer\n");
return 0;
}
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index f99b32a..43c3b75 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -39,13 +39,13 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char
*sock)
err = os_pipe(in_fds, 1, 0);
if (err < 0) {
- printk("harddog_open - os_pipe failed, err = %d\n", -err);
+ pr_err("harddog_open - os_pipe failed, err = %d\n", -err);
goto out;
}
err = os_pipe(out_fds, 1, 0);
if (err < 0) {
- printk("harddog_open - os_pipe failed, err = %d\n", -err);
+ pr_err("harddog_open - os_pipe failed, err = %d\n", -err);
goto out_close_in;
}
@@ -71,20 +71,20 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char
*sock)
if (pid < 0) {
err = -pid;
- printk("harddog_open - run_helper failed, errno = %d\n", -err);
+ pr_err("harddog_open - run_helper failed, errno = %d\n", -err);
goto out_close_out;
}
n = read(in_fds[0], &c, sizeof(c));
if (n == 0) {
- printk("harddog_open - EOF on watchdog pipe\n");
+ pr_err("harddog_open - EOF on watchdog pipe\n");
helper_wait(pid);
err = -EIO;
goto out_close_out;
}
else if (n < 0) {
- printk("harddog_open - read of watchdog pipe failed, "
- "err = %d\n", errno);
+ pr_err("harddog_open - read of watchdog pipe failed, err =
%d\n",
+ errno);
helper_wait(pid);
err = n;
goto out_close_out;
@@ -116,7 +116,7 @@ int ping_watchdog(int fd)
n = write(fd, &c, sizeof(c));
if (n != sizeof(c)) {
- printk("ping_watchdog - write failed, ret = %d, err = %d\n",
+ pr_err("ping_watchdog - write failed, ret = %d, err = %d\n",
n, errno);
if (n < 0)
return n;
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index ccab947..bcea904 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -28,7 +28,7 @@ void pcap_init(struct ne
Re: [uml-devel] [PATCH 0/4] UserModeLinux: Message logging neatening
On Wed, 2014-05-14 at 21:52 +0200, Richard Weinberger wrote: > Am 10.05.2014 01:43, schrieb Joe Perches: > > Joe Perches (4): > > UserModeLinux: Convert UM_KERN_ to KERN_ > > UserModeLinux: Remove unused #defines of UM_KERN_ > > UserModeLinux: Use a more current logging style > > UserModeLinux: Convert printks to pr_ > Thank you Joe! > I'll queue your patches for 3.16. (adding Geert to cc's) Hi Richard. Please queue only patches 1 and 2. Patches 3 and 4 are currently defective. These need a bit of rework to compile appropriately. I'll do what Al suggested below one day soon. from: https://lkml.org/lkml/2012/9/29/106 On Sat, Sep 29, 2012 at 10:43 PM, Al Viro wrote: > On Sat, Sep 29, 2012 at 10:27:44PM +0200, Geert Uytterhoeven wrote: >> On Sat, Sep 29, 2012 at 10:10 PM, Joe Perches wrote: >> >> @@ -88,7 +88,7 @@ static int do_aio(aio_context_t ctx, enum aio_type >> >> type, int fd, char *buf, >> >> iocbp->aio_nbytes = sizeof(c); >> >> break; >> >> default: >> >> - printk(UM_KERN_ERR "Bogus op in do_aio - %d\n", type); >> >> + printk(KERN_ERR "Bogus op in do_aio - %d\n", type); >> > >> > Maybe a follow-on patch to convert these to pr_? >> >> That requires adding pr_ to arch/um/include/shared/user.h first. >> Or to avoid duplication, extracting the pr_ definitions from >> include/linux/printk.h to a new header file, and preincluding that one for >> the user part of UML, too. > > Yecchhh Just how many of those pre-includes do you want to add? > Seriously, if we get enough of those, it might make more sense to take > them into a separate directory and add it to search paths, including > that for userland objects of uml. If not, I'd rather copy them to > include/generated in arch/um/Makefile and explicitly #include > > them from user.h. It's trivially doable and as long as we have relatively > few of those guys it's less PITA... -- "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [PATCH v3] um: net: replace GFP_KERNEL with GFP_ATOMIC when spinlock is held
On Thu, 2015-10-29 at 14:46 +0530, Saurabh Sengar wrote:
> replace GFP_KERNEL with GFP_ATOMIC while spinlock is held,
> as code while holding a spinlock should be atomic.
> GFP_KERNEL may sleep and can cause deadlock,
> where as GFP_ATOMIC may fail but certainly avoids deadlock
>
> Signed-off-by: Saurabh Sengar
> ---
> v3: removed the atomic variable, as per Richard comment
Trivia: You could remove the gfp_mask variables too
and just use GFP_KERNEL and GFP_ATOMIC directly.
> diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
[]
> @@ -600,20 +600,22 @@ void register_transport(struct transport *new)
> void *init;
> char *mac = NULL;
> int match;
> + int gfp_mask;
>
> spin_lock(&transports_lock);
> BUG_ON(!list_empty(&new->list));
> list_add(&new->list, &transports);
> spin_unlock(&transports_lock);
>
> + gfp_mask = GFP_KERNEL;
> list_for_each_safe(ele, next, ð_cmd_line) {
> eth = list_entry(ele, struct eth_init, list);
> match = check_transport(new, eth->init, eth->index, &init,
> - &mac);
> + &mac, gfp_mask);
> if (!match)
> continue;
> else if (init != NULL) {
> - eth_configure(eth->index, init, mac, new);
> + eth_configure(eth->index, init, mac, new, gfp_mask);
> kfree(init);
> }
> list_del(ð->list);
> @@ -627,14 +629,17 @@ static int eth_setup_common(char *str, int index)
> void *init;
> char *mac = NULL;
> int found = 0;
> + int gfp_mask;
>
> spin_lock(&transports_lock);
> + gfp_mask = GFP_ATOMIC;
> list_for_each(ele, &transports) {
> transport = list_entry(ele, struct transport, list);
> - if (!check_transport(transport, str, index, &init, &mac))
> + if (!check_transport(transport, str, index, &init,
> + &mac, gfp_mask))
> continue;
> if (init != NULL) {
> - eth_configure(index, init, mac, transport);
> + eth_configure(index, init, mac, transport, gfp_mask);
> kfree(init);
> }
> found = 1;
--
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] [PATCH] um: Use common error handling code in port_listen_fd()
On Fri, 2017-10-20 at 19:29 +0200, SF Markus Elfring wrote: > arch/um/drivers/port_user.c If you are going to use multiple labels, it'd be nicer to rename out: too. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Re: [uml-devel] drivers/infiniband/mlx/mad.c misplaced ;
On Wed, 2007-08-15 at 19:58 -0400, Dave Jones wrote: > Signed-off-by: Dave Jones <[EMAIL PROTECTED]> > > diff --git a/drivers/infiniband/hw/mlx4/mad.c > b/drivers/infiniband/hw/mlx4/mad.c > index 3330917..0ed02b7 100644 > --- a/drivers/infiniband/hw/mlx4/mad.c > +++ b/drivers/infiniband/hw/mlx4/mad.c > @@ -109,7 +109,7 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int > ignore_mkey, int ignore_bkey, > in_modifier, op_modifier, > MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C); > > - if (!err); > + if (!err) There's more than a few of these (not inspected). $ egrep -r --include=*.c "\bif[[:space:]]*\([^\)]*\)[[:space:]]*\;" * arch/sh/boards/se/7343/io.c:if (0) ; drivers/atm/iphase.c: if (!desc1) ; drivers/infiniband/hw/mlx4/mad.c: if (!err); drivers/isdn/capi/capiutil.c: else if (c <= 0x0f); drivers/net/tokenring/ibmtr.c: else if (ti->shared_ram_paging == 0xf); /* No paging in adapter */ drivers/s390/scsi/zfcp_erp.c: if (status == ZFCP_ERP_SUCCEEDED) ; /* no further action */ fs/hostfs/hostfs_user.c:if(attrs->ia_valid & HOSTFS_ATTR_CTIME) ; net/netfilter/xt_u32.c: if (skb->len < 4 || pos > skb->len - 4); sound/pci/au88x0/au88x0_synth.c:if (eax == 0) ; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH] convert #include "linux/..." and #include "asm/..." to #include <...>
There are several files that: #include "linux/file" not #include #include "asm/file" not #include Here's the little script that converted them: egrep -i -r -l --include=*.[ch] \ "^[[:space:]]*\#[[:space:]]*include[[:space:]]*\"(linux|asm)/(.*)\"" * \ | xargs sed -i -e 's/^[[:space:]]*#[[:space:]]*include[[:space:]]*"\(linux\|asm\)\/\(.*\)"/#include <\1\/\2>/g' Signed-off-by: Joe Perches <[EMAIL PROTECTED]> Acked-by: Christoph Lameter <[EMAIL PROTECTED]> Acked-by: Jeff Dike <[EMAIL PROTECTED]> Please pull from: git pull git://repo.or.cz/linux-2.6/trivial-mods.git fix_includes diffstat below: .../firmware_class/firmware_sample_driver.c|2 +- arch/um/drivers/daemon_kern.c |8 ++-- arch/um/drivers/hostaudio_kern.c | 14 +++--- arch/um/drivers/line.c | 14 +++--- arch/um/drivers/mcast_kern.c | 12 ++-- arch/um/drivers/mconsole_kern.c| 42 +++--- arch/um/drivers/net_kern.c | 32 ++-- arch/um/drivers/pcap_kern.c|6 +- arch/um/drivers/port_kern.c| 18 +++--- arch/um/drivers/slip_kern.c| 10 ++-- arch/um/drivers/slirp_kern.c | 10 ++-- arch/um/drivers/ssl.c | 18 +++--- arch/um/drivers/stdio_console.c| 32 ++-- arch/um/drivers/ubd_kern.c | 40 +++--- arch/um/drivers/ubd_user.c |2 +- arch/um/include/chan_kern.h|6 +- arch/um/include/irq_kern.h |4 +- arch/um/include/line.h | 12 ++-- arch/um/include/mconsole_kern.h|2 +- arch/um/include/mem.h |2 +- arch/um/include/mem_kern.h |4 +- arch/um/include/os.h |2 +- arch/um/include/skas/mmu-skas.h|2 +- arch/um/include/skas/mode_kern_skas.h |6 +- arch/um/include/skas/uaccess-skas.h|2 +- arch/um/include/sysdep-i386/checksum.h |4 +- arch/um/include/sysdep-i386/syscalls.h |2 +- arch/um/include/sysdep-ppc/ptrace.h|2 +- arch/um/include/sysdep-x86_64/checksum.h |6 +- arch/um/include/tt/mode_kern_tt.h |8 ++-- arch/um/include/tt/uaccess-tt.h| 12 ++-- arch/um/include/um_uaccess.h |2 +- arch/um/kernel/exec.c | 16 +++--- arch/um/kernel/exitcode.c | 10 ++-- arch/um/kernel/gmon_syms.c |2 +- arch/um/kernel/gprof_syms.c|2 +- arch/um/kernel/init_task.c | 16 +++--- arch/um/kernel/initrd.c|8 ++-- arch/um/kernel/irq.c | 40 +++--- arch/um/kernel/ksyms.c | 24 arch/um/kernel/mem.c | 24 arch/um/kernel/physmem.c | 18 +++--- arch/um/kernel/process.c | 56 ++-- arch/um/kernel/ptrace.c| 20 arch/um/kernel/reboot.c|6 +- arch/um/kernel/sigio.c | 10 ++-- arch/um/kernel/signal.c| 30 +- arch/um/kernel/skas/exec.c | 14 +++--- arch/um/kernel/skas/mem.c |4 +- arch/um/kernel/skas/mmu.c | 24 arch/um/kernel/skas/process.c | 18 +++--- arch/um/kernel/skas/syscall.c | 12 ++-- arch/um/kernel/skas/tlb.c | 12 ++-- arch/um/kernel/skas/uaccess.c | 20 arch/um/kernel/smp.c | 24 arch/um/kernel/syscall.c | 30 +- arch/um/kernel/sysrq.c | 12 ++-- arch/um/kernel/time.c | 28 +- arch/um/kernel/tlb.c | 10 ++-- arch/um/kernel/trap.c | 28 +- arch/um/kernel/tt/exec_kern.c | 14 +++--- arch/um/kernel/tt/gdb_kern.c |2 +- arch/um/kernel/tt/ksyms.c |4 +- arch/um/kernel/tt/mem.c|6 +- arch/um/kernel/tt/process_kern.c | 18 +++--- arch/um/kernel/tt/syscall_kern.c
Re: [uml-devel] [PATCH 3/4] UML - Implement get_wchan
On Tue, 2007-10-30 at 13:28 -0400, Jeff Dike wrote:
> +unsigned long get_wchan(struct task_struct *p)
> +{
> + unsigned long stack_page, sp, ip, count = 0;
Perhaps instead of unsigned long?
bool skipped_ip;//delayed initialization
> +
> + if ((p == NULL) || (p == current) || (p->state == TASK_RUNNING))
> + return 0;
> +
> + stack_page = (unsigned long) task_stack_page(p);
> + /* Bail if the process has no kernel stack for some reason */
> + if (stack_page == 0)
> + return 0;
> +
> + sp = p->thread.switch_buf->JB_SP;
> + /*
> + * Bail if the stack pointer is below the bottom of the kernel
> + * stack for some reason
> + */
> + if (sp < stack_page)
> + return 0;
> +
skipped_ip = false;
> + while (sp < stack_page + THREAD_SIZE) {
> + ip = *((unsigned long *) sp);
> + if (kernel_text_address(ip) && !in_sched_functions(ip)) {
> + /*
> + * Skip one valid IP, which will be the low-level UML
> + * context switcher.
> + */
> + if (count++ == 1)
> + return ip;
if (skipped_ip)
return ip;
skipped_ip = true;
>
> + }
> +
> + sp += sizeof(unsigned long);
> + }
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 08/59] arch/um: Add missing "space"
Signed-off-by: Joe Perches <[EMAIL PROTECTED]>
---
arch/um/drivers/vde_user.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c
index d9941fe..56533db 100644
--- a/arch/um/drivers/vde_user.c
+++ b/arch/um/drivers/vde_user.c
@@ -80,7 +80,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init
*init)
vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
if (vpri->args == NULL) {
- printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args"
+ printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args "
"allocation failed");
return;
}
--
1.5.3.5.652.gf192c
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH] arch/um: Spelling fixes
Signed-off-by: Joe Perches <[EMAIL PROTECTED]> --- arch/um/sys-x86_64/signal.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c index 1778d33..3a63862 100644 --- a/arch/um/sys-x86_64/signal.c +++ b/arch/um/sys-x86_64/signal.c @@ -112,7 +112,7 @@ static int copy_sc_to_user(struct sigcontext __user *to, err |= PUTREG(regs, RSI, to, rsi); err |= PUTREG(regs, RBP, to, rbp); /* -* Must use orignal RSP, which is passed in, rather than what's in +* Must use original RSP, which is passed in, rather than what's in * the pt_regs, because that's already been updated to point at the * signal frame. */ -- 1.5.3.7.949.g2221a6 - SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 05/11] arch/um: Convert #ifdef DEBUG printk(KERN_DEBUG to pr_debug(
From: Joe Perches
Signed-off-by: Joe Perches
---
arch/um/drivers/hostaudio_kern.c | 38 +++---
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 368219c..2f5b343 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -75,9 +75,7 @@ static ssize_t hostaudio_read(struct file *file, char __user
*buffer,
void *kbuf;
int err;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: read called, count = %d\n", count);
-#endif
+ pr_debug("hostaudio: read called, count = %d\n", count);
kbuf = kmalloc(count, GFP_KERNEL);
if (kbuf == NULL)
@@ -102,9 +100,7 @@ static ssize_t hostaudio_write(struct file *file, const
char __user *buffer,
void *kbuf;
int err;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: write called, count = %d\n", count);
-#endif
+ pr_debug("hostaudio: write called, count = %d\n", count);
kbuf = kmalloc(count, GFP_KERNEL);
if (kbuf == NULL)
@@ -129,9 +125,7 @@ static unsigned int hostaudio_poll(struct file *file,
{
unsigned int mask = 0;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: poll called (unimplemented)\n");
-#endif
+ pr_debug("hostaudio: poll called (unimplemented)\n");
return mask;
}
@@ -143,9 +137,8 @@ static int hostaudio_ioctl(struct inode *inode, struct file
*file,
unsigned long data = 0;
int err;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: ioctl called, cmd = %u\n", cmd);
-#endif
+ pr_debug("hostaudio: ioctl called, cmd = %u\n", cmd);
+
switch(cmd){
case SNDCTL_DSP_SPEED:
case SNDCTL_DSP_STEREO:
@@ -185,9 +178,7 @@ static int hostaudio_open(struct inode *inode, struct file
*file)
int r = 0, w = 0;
int ret;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp);
-#endif
+ pr_debug("hostaudio: open called (host: %s)\n", dsp);
state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
if (state == NULL)
@@ -212,9 +203,8 @@ static int hostaudio_release(struct inode *inode, struct
file *file)
{
struct hostaudio_state *state = file->private_data;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostaudio: release called\n");
-#endif
+ pr_debug("hostaudio: release called\n");
+
os_close_file(state->fd);
kfree(state);
@@ -228,9 +218,7 @@ static int hostmixer_ioctl_mixdev(struct inode *inode,
struct file *file,
{
struct hostmixer_state *state = file->private_data;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostmixer: ioctl called\n");
-#endif
+ pr_debug("hostmixer: ioctl called\n");
return os_ioctl_generic(state->fd, cmd, arg);
}
@@ -241,9 +229,7 @@ static int hostmixer_open_mixdev(struct inode *inode,
struct file *file)
int r = 0, w = 0;
int ret;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostmixer: open called (host: %s)\n", mixer);
-#endif
+ pr_debug("hostmixer: open called (host: %s)\n", mixer);
state = kmalloc(sizeof(struct hostmixer_state), GFP_KERNEL);
if (state == NULL)
@@ -271,9 +257,7 @@ static int hostmixer_release(struct inode *inode, struct
file *file)
{
struct hostmixer_state *state = file->private_data;
-#ifdef DEBUG
- printk(KERN_DEBUG "hostmixer: release called\n");
-#endif
+ pr_debug("hostmixer: release called\n");
os_close_file(state->fd);
kfree(state);
--
1.6.3.1.9.g95405b.dirty
--
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 10/62] arch/um/drivers/net_kern.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches
---
arch/um/drivers/net_kern.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 3b44b47..5072d4b 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char
**str_out,
char **error_out)
{
char *end;
- int n, err = -EINVAL;;
+ int n, err = -EINVAL;
n = simple_strtoul(str, &end, 0);
if (end == str) {
--
1.6.3.1.10.g659a0.dirty
--
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 03/44] arch/um: Remove unnecessary semicolons
Signed-off-by: Joe Perches
---
arch/um/drivers/mmapper_kern.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index 8501e7d..6256fa9 100644
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -122,7 +122,7 @@ static int __init mmapper_init(void)
if (err) {
printk(KERN_ERR "mmapper - misc_register failed, err = %d\n",
err);
- return err;;
+ return err;
}
return 0;
}
--
1.7.3.1.g432b3.dirty
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
[uml-devel] [PATCH 00/44] remove unnecessary semicolons
ya trivial series... Joe Perches (44): arch/arm: Remove unnecessary semicolons arch/microblaze: Remove unnecessary semicolons arch/um: Remove unnecessary semicolons drivers/cpufreq: Remove unnecessary semicolons drivers/gpio: Remove unnecessary semicolons drivers/i2c: Remove unnecessary semicolons drivers/isdn: Remove unnecessary semicolons drivers/leds: Remove unnecessary semicolons drivers/media/video: Remove unnecessary semicolons drivers/misc: Remove unnecessary semicolons drivers/mmc: Remove unnecessary semicolons drivers/net/bnx2x: Remove unnecessary semicolons drivers/net/e1000e: Remove unnecessary semicolons drivers/net/ixgbe: Remove unnecessary semicolons drivers/net/vxge: Remove unnecessary semicolons drivers/net/wireless/ath: Remove unnecessary semicolons drivers/net/wireless/iwlwifi: Remove unnecessary semicolons drivers/net/cnic.c: Remove unnecessary semicolons drivers/platform/x86: Remove unnecessary semicolons drivers/power: Remove unnecessary semicolons drivers/s390/net: Remove unnecessary semicolons drivers/scsi/be2iscsi: Remove unnecessary semicolons drivers/scsi/bfa: Remove unnecessary semicolons drivers/scsi/lpfc: Remove unnecessary semicolons drivers/scsi/pm8001: Remove unnecessary semicolons drivers/scsi/qla2xxx: Remove unnecessary semicolons drivers/serial: Remove unnecessary semicolons drivers/spi: Remove unnecessary semicolons drivers/staging: Remove unnecessary semicolons drivers/usb/gadget: Remove unnecessary semicolons drivers/xen: Remove unnecessary semicolons fs/9p: Remove unnecessary semicolons fs/ceph: Remove unnecessary semicolons fs/logfs: Remove unnecessary semicolons fs/nfs: Remove unnecessary semicolons fs/ocfs2: Remove unnecessary semicolons fs/ubifs: Remove unnecessary semicolons include/linux/if_macvlan.h: Remove unnecessary semicolons include/net/caif/cfctrl.h: Remove unnecessary semicolons mm/hugetlb.c: Remove unnecessary semicolons net/ipv6/mcast.c: Remove unnecessary semicolons net/sunrpc/addr.c: Remove unnecessary semicolons sound/core/pcm_lib.c: Remove unnecessary semicolons sound/soc/codecs: Remove unnecessary semicolons arch/arm/mach-at91/at91cap9_devices.c |2 +- arch/arm/mach-at91/at91sam9g45_devices.c |2 +- arch/arm/mach-at91/at91sam9rl_devices.c|2 +- arch/arm/mach-nuc93x/time.c|2 +- arch/arm/mach-tegra/tegra2_clocks.c|2 +- arch/arm/mach-w90x900/cpu.c|2 +- arch/arm/plat-mxc/irq.c|2 +- arch/microblaze/lib/memmove.c |2 +- arch/um/drivers/mmapper_kern.c |2 +- drivers/cpufreq/cpufreq_conservative.c |2 +- drivers/gpio/langwell_gpio.c |2 +- drivers/i2c/busses/i2c-designware.c|2 +- drivers/isdn/hardware/mISDN/mISDNinfineon.c|4 ++-- drivers/isdn/hardware/mISDN/mISDNisar.c|2 +- drivers/leds/leds-mc13783.c|2 +- drivers/media/video/cx88/cx88-blackbird.c |2 +- drivers/media/video/davinci/vpfe_capture.c |2 +- drivers/media/video/em28xx/em28xx-cards.c |2 +- drivers/misc/bmp085.c |2 +- drivers/misc/isl29020.c|2 +- drivers/mmc/host/davinci_mmc.c |2 +- drivers/net/bnx2x/bnx2x_link.c |4 ++-- drivers/net/bnx2x/bnx2x_main.c |2 +- drivers/net/cnic.c |2 +- drivers/net/e1000e/netdev.c|2 +- drivers/net/ixgbe/ixgbe_sriov.c|2 +- drivers/net/vxge/vxge-main.c |2 +- drivers/net/wireless/ath/ath9k/htc.h |2 +- drivers/net/wireless/iwlwifi/iwl-agn.c |2 +- drivers/platform/x86/classmate-laptop.c|2 +- drivers/platform/x86/thinkpad_acpi.c |2 +- drivers/power/intel_mid_battery.c |2 +- drivers/s390/net/qeth_core_sys.c |2 +- drivers/scsi/be2iscsi/be_main.c|4 ++-- drivers/scsi/bfa/bfa_fcs_lport.c |2 +- drivers/scsi/lpfc/lpfc_bsg.c |2 +- drivers/scsi/pm8001/pm8001_init.c |2 +- drivers/scsi/qla2xxx/qla_isr.c |4 ++-- drivers/scsi/qla2xxx/qla_nx.c |2 +- drivers/serial/mrst_max3110.c |2 +- drivers/spi/amba-pl022.c |2 +- drivers/spi/spi_nuc900.c |2 +- .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c |2 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c |2 +- drivers/staging/bcm/InterfaceInit.c|2
[uml-devel] [PATCH] checkpatch: Add warning for uses of printk_ratelimit
Warn about uses of printk_ratelimit because it uses a
global state and can hide subsequent useful messages.
Signed-off-by: Joe Perches
---
scripts/checkpatch.pl |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index d867081..d1a9adc 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1943,6 +1943,11 @@ sub process {
WARN("LINUX_VERSION_CODE should be avoided, code should
be for the version to which it is merged\n" . $herecurr);
}
+# check for uses of printk_ratelimit
+ if ($line =~ /\bprintk_ratelimit\s*\(/) {
+ WARN("Prefer printk_ratelimited or
pr__ratelimited to printk_ratelimit\n" . $herecurr);
+ }
+
# printk should use KERN_* levels. Note that follow on printk's on the
# same line do not need a level, so we use the current block context
# to try and find and validate the current printk. In summary the current
--
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
___
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
