diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-08 07:22:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:42 -0500 |
commit | 5134d8fea06ab51459fd095d091d1e6f73a44553 (patch) | |
tree | 504a84a9290a40f0c98b7c5731b7df82cb357ebe /arch/um/os-Linux/drivers | |
parent | 536788fe2d28e11db6aeda74207d95d750fb761f (diff) |
uml: style fixes in arch/um/os-Linux
Style changes under arch/um/os-Linux:
include trimming
CodingStyle fixes
some printks needed severity indicators
make_tempfile turns out not to be used outside of mem.c, so it is now static.
Its declaration in tempfile.h is no longer needed, and tempfile.h itself is no
longer needed.
create_tmp_file was also made static.
checkpatch moans about an EXPORT_SYMBOL in user_syms.c which is part of a
macro definition - this is copying a bit of kernel infrastructure into the
libc side of UML because the kernel headers can't be included there.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/drivers')
-rw-r--r-- | arch/um/os-Linux/drivers/ethertap_kern.c | 8 | ||||
-rw-r--r-- | arch/um/os-Linux/drivers/tuntap_kern.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c index 04f11b9f1ac0..046a131f6104 100644 --- a/arch/um/os-Linux/drivers/ethertap_kern.c +++ b/arch/um/os-Linux/drivers/ethertap_kern.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Licensed under the GPL. | 6 | * Licensed under the GPL. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "linux/init.h" | 9 | #include <linux/init.h> |
10 | #include <linux/netdevice.h> | 10 | #include <linux/netdevice.h> |
11 | #include "etap.h" | 11 | #include "etap.h" |
12 | #include "net_kern.h" | 12 | #include "net_kern.h" |
@@ -30,10 +30,10 @@ static void etap_init(struct net_device *dev, void *data) | |||
30 | epri->control_fd = -1; | 30 | epri->control_fd = -1; |
31 | epri->dev = dev; | 31 | epri->dev = dev; |
32 | 32 | ||
33 | printk("ethertap backend - %s", epri->dev_name); | 33 | printk(KERN_INFO "ethertap backend - %s", epri->dev_name); |
34 | if (epri->gate_addr != NULL) | 34 | if (epri->gate_addr != NULL) |
35 | printk(", IP = %s", epri->gate_addr); | 35 | printk(KERN_CONT ", IP = %s", epri->gate_addr); |
36 | printk("\n"); | 36 | printk(KERN_CONT "\n"); |
37 | } | 37 | } |
38 | 38 | ||
39 | static int etap_read(int fd, struct sk_buff *skb, struct uml_net_private *lp) | 39 | static int etap_read(int fd, struct sk_buff *skb, struct uml_net_private *lp) |
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c index 9d384807b077..6b9e33d5de20 100644 --- a/arch/um/os-Linux/drivers/tuntap_kern.c +++ b/arch/um/os-Linux/drivers/tuntap_kern.c | |||
@@ -29,10 +29,10 @@ static void tuntap_init(struct net_device *dev, void *data) | |||
29 | tpri->fd = -1; | 29 | tpri->fd = -1; |
30 | tpri->dev = dev; | 30 | tpri->dev = dev; |
31 | 31 | ||
32 | printk("TUN/TAP backend - "); | 32 | printk(KERN_INFO "TUN/TAP backend - "); |
33 | if (tpri->gate_addr != NULL) | 33 | if (tpri->gate_addr != NULL) |
34 | printk("IP = %s", tpri->gate_addr); | 34 | printk(KERN_CONT "IP = %s", tpri->gate_addr); |
35 | printk("\n"); | 35 | printk(KERN_CONT "\n"); |
36 | } | 36 | } |
37 | 37 | ||
38 | static int tuntap_read(int fd, struct sk_buff *skb, struct uml_net_private *lp) | 38 | static int tuntap_read(int fd, struct sk_buff *skb, struct uml_net_private *lp) |