The patch titled
uml: split memory allocation prototypes out of user.h
has been removed from the -mm tree. Its filename was
uml-split-memory-allocation-prototypes-out-of-userh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: split memory allocation prototypes out of user.h
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
user.h is too generic a header name. I've split out allocation routines from
it.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/drivers/cow_sys.h | 1 +
arch/um/drivers/daemon_user.c | 1 +
arch/um/drivers/fd.c | 1 +
arch/um/drivers/mcast_user.c | 1 +
arch/um/drivers/net_user.c | 1 +
arch/um/drivers/pcap_user.c | 1 +
arch/um/drivers/port_user.c | 1 +
arch/um/drivers/pty.c | 1 +
arch/um/drivers/slip_user.c | 1 +
arch/um/drivers/tty.c | 1 +
arch/um/include/um_malloc.h | 17 +++++++++++++++++
arch/um/include/user.h | 6 ------
arch/um/include/user_util.h | 1 -
arch/um/kernel/irq.c | 1 +
arch/um/kernel/process.c | 1 +
arch/um/os-Linux/drivers/ethertap_user.c | 1 +
arch/um/os-Linux/irq.c | 1 +
arch/um/os-Linux/main.c | 1 +
arch/um/os-Linux/sigio.c | 1 +
19 files changed, 33 insertions(+), 7 deletions(-)
diff -puN arch/um/drivers/cow_sys.h~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/cow_sys.h
--- a/arch/um/drivers/cow_sys.h~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/cow_sys.h
@@ -5,6 +5,7 @@
#include "user_util.h"
#include "os.h"
#include "user.h"
+#include "um_malloc.h"
static inline void *cow_malloc(int size)
{
diff -puN arch/um/drivers/daemon_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/daemon_user.c
--- a/arch/um/drivers/daemon_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/daemon_user.c
@@ -17,6 +17,7 @@
#include "user_util.h"
#include "user.h"
#include "os.h"
+#include "um_malloc.h"
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
diff -puN arch/um/drivers/fd.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/fd.c
--- a/arch/um/drivers/fd.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/fd.c
@@ -12,6 +12,7 @@
#include "user_util.h"
#include "chan_user.h"
#include "os.h"
+#include "um_malloc.h"
struct fd_chan {
int fd;
diff -puN arch/um/drivers/mcast_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/mcast_user.c
--- a/arch/um/drivers/mcast_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/mcast_user.c
@@ -23,6 +23,7 @@
#include "user_util.h"
#include "user.h"
#include "os.h"
+#include "um_malloc.h"
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
diff -puN arch/um/drivers/net_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/net_user.c
--- a/arch/um/drivers/net_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/net_user.c
@@ -18,6 +18,7 @@
#include "kern_util.h"
#include "net_user.h"
#include "os.h"
+#include "um_malloc.h"
int tap_open_common(void *dev, char *gate_addr)
{
diff -puN arch/um/drivers/pcap_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/pcap_user.c
--- a/arch/um/drivers/pcap_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/pcap_user.c
@@ -12,6 +12,7 @@
#include "net_user.h"
#include "pcap_user.h"
#include "user.h"
+#include "um_malloc.h"
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
diff -puN arch/um/drivers/port_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/port_user.c
--- a/arch/um/drivers/port_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/port_user.c
@@ -19,6 +19,7 @@
#include "chan_user.h"
#include "port.h"
#include "os.h"
+#include "um_malloc.h"
struct port_chan {
int raw;
diff -puN arch/um/drivers/pty.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/pty.c
--- a/arch/um/drivers/pty.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/pty.c
@@ -13,6 +13,7 @@
#include "user_util.h"
#include "kern_util.h"
#include "os.h"
+#include "um_malloc.h"
struct pty_chan {
void (*announce)(char *dev_name, int dev);
diff -puN arch/um/drivers/slip_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/slip_user.c
--- a/arch/um/drivers/slip_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/slip_user.c
@@ -15,6 +15,7 @@
#include "slip.h"
#include "slip_common.h"
#include "os.h"
+#include "um_malloc.h"
void slip_user_init(void *data, void *dev)
{
diff -puN arch/um/drivers/tty.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/drivers/tty.c
--- a/arch/um/drivers/tty.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/drivers/tty.c
@@ -11,6 +11,7 @@
#include "user_util.h"
#include "user.h"
#include "os.h"
+#include "um_malloc.h"
struct tty_chan {
char *dev;
diff -puN /dev/null arch/um/include/um_malloc.h
--- /dev/null
+++ a/arch/um/include/um_malloc.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2005 Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
+ * Licensed under the GPL
+ */
+
+#ifndef __UM_MALLOC_H__
+#define __UM_MALLOC_H__
+
+extern void *um_kmalloc(int size);
+extern void *um_kmalloc_atomic(int size);
+extern void kfree(const void *ptr);
+
+extern void *um_vmalloc(int size);
+extern void *um_vmalloc_atomic(int size);
+extern void vfree(void *ptr);
+
+#endif /* __UM_MALLOC_H__ */
diff -puN arch/um/include/user.h~uml-split-memory-allocation-prototypes-out-of-userh arch/um/include/user.h
--- a/arch/um/include/user.h~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/include/user.h
@@ -11,17 +11,11 @@ extern void panic(const char *fmt, ...)
extern int printk(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2)));
extern void schedule(void);
-extern void *um_kmalloc(int size);
-extern void *um_kmalloc_atomic(int size);
-extern void kfree(void *ptr);
extern int in_aton(char *str);
extern int open_gdb_chan(void);
/* These use size_t, however unsigned long is correct on both i386 and x86_64. */
extern unsigned long strlcpy(char *, const char *, unsigned long);
extern unsigned long strlcat(char *, const char *, unsigned long);
-extern void *um_vmalloc(int size);
-extern void *um_vmalloc_atomic(int size);
-extern void vfree(void *ptr);
#endif
diff -puN arch/um/include/user_util.h~uml-split-memory-allocation-prototypes-out-of-userh arch/um/include/user_util.h
--- a/arch/um/include/user_util.h~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/include/user_util.h
@@ -52,7 +52,6 @@ extern int linux_main(int argc, char **a
extern void set_cmdline(char *cmd);
extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
extern int get_pty(void);
-extern void *um_kmalloc(int size);
extern int switcheroo(int fd, int prot, void *from, void *to, int size);
extern void do_exec(int old_pid, int new_pid);
extern void tracer_panic(char *msg, ...)
diff -puN arch/um/kernel/irq.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/kernel/irq.c
--- a/arch/um/kernel/irq.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/kernel/irq.c
@@ -31,6 +31,7 @@
#include "irq_kern.h"
#include "os.h"
#include "sigio.h"
+#include "um_malloc.h"
#include "misc_constants.h"
/*
diff -puN arch/um/kernel/process.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/kernel/process.c
--- a/arch/um/kernel/process.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/kernel/process.c
@@ -46,6 +46,7 @@
#include "mode.h"
#include "mode_kern.h"
#include "choose-mode.h"
+#include "um_malloc.h"
/* This is a per-cpu array. A processor only modifies its entry and it only
* cares about its entry, so it's OK if another processor is modifying its
diff -puN arch/um/os-Linux/drivers/ethertap_user.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/os-Linux/drivers/ethertap_user.c
--- a/arch/um/os-Linux/drivers/ethertap_user.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/os-Linux/drivers/ethertap_user.c
@@ -20,6 +20,7 @@
#include "net_user.h"
#include "etap.h"
#include "os.h"
+#include "um_malloc.h"
#define MAX_PACKET ETH_MAX_PACKET
diff -puN arch/um/os-Linux/irq.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/os-Linux/irq.c
--- a/arch/um/os-Linux/irq.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/os-Linux/irq.c
@@ -18,6 +18,7 @@
#include "sigio.h"
#include "irq_user.h"
#include "os.h"
+#include "um_malloc.h"
static struct pollfd *pollfds = NULL;
static int pollfds_num = 0;
diff -puN arch/um/os-Linux/main.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/os-Linux/main.c
--- a/arch/um/os-Linux/main.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/os-Linux/main.c
@@ -23,6 +23,7 @@
#include "choose-mode.h"
#include "uml-config.h"
#include "os.h"
+#include "um_malloc.h"
/* Set in set_stklim, which is called from main and __wrap_malloc.
* __wrap_malloc only calls it if main hasn't started.
diff -puN arch/um/os-Linux/sigio.c~uml-split-memory-allocation-prototypes-out-of-userh arch/um/os-Linux/sigio.c
--- a/arch/um/os-Linux/sigio.c~uml-split-memory-allocation-prototypes-out-of-userh
+++ a/arch/um/os-Linux/sigio.c
@@ -19,6 +19,7 @@
#include "user_util.h"
#include "sigio.h"
#include "os.h"
+#include "um_malloc.h"
/* Protected by sigio_lock(), also used by sigio_cleanup, which is an
* exitcall.
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
origin.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
