diff options
| author | greg@kroah.com <greg@kroah.com> | 2004-02-12 01:14:48 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:32:26 -0700 |
| commit | ede4308a803131f473efed3dc3246ffac7163dfa (patch) | |
| tree | 4da08a0d04f5e13f7002f828d31465b892362f8c | |
| parent | 2e31718495a89e6b582240ed527950f78e7d1849 (diff) | |
[PATCH] remove some more KLIBC fixups that are no longer needed.
| -rw-r--r-- | klibc_fixups.h | 6 | ||||
| -rw-r--r-- | udev-add.c | 9 |
2 files changed, 1 insertions, 14 deletions
diff --git a/klibc_fixups.h b/klibc_fixups.h index 37622c86d6..1ac112b087 100644 --- a/klibc_fixups.h +++ b/klibc_fixups.h @@ -3,12 +3,6 @@ #ifndef KLIBC_FIXUPS_H #define KLIBC_FIXUPS_H - -#define WTERMSIG(status) ((status) & 0x7f) -#define WEXITSTATUS(status) (((status) & 0xff00) >> 8) -#define WIFEXITED(status) (WTERMSIG(status) == 0) - - struct group { char *gr_name; /* group name */ char *gr_passwd; /* group password */ diff --git a/udev-add.c b/udev-add.c index 9f07d22ec6..fedc8f0fc8 100644 --- a/udev-add.c +++ b/udev-add.c @@ -109,19 +109,12 @@ static int create_node(struct udevice *dev) int retval = 0; uid_t uid = 0; gid_t gid = 0; - dev_t res; int i; int tail; strncpy(filename, udev_root, sizeof(filename)); strncat(filename, dev->name, sizeof(filename)); -#ifdef __KLIBC__ - res = (dev->major << 8) | (dev->minor); -#else - res = makedev(dev->major, dev->minor); -#endif - switch (dev->type) { case 'b': dev->mode |= S_IFBLK; @@ -144,7 +137,7 @@ static int create_node(struct udevice *dev) info("creating device node '%s'", filename); dbg("mknod(%s, %#o, %u, %u)", filename, dev->mode, dev->major, dev->minor); - retval = mknod(filename, dev->mode, res); + retval = mknod(filename, dev->mode, makedev(dev->major, dev->minor)); if (retval != 0) dbg("mknod(%s, %#o, %u, %u) failed with error '%s'", filename, dev->mode, dev->major, dev->minor, strerror(errno)); |