[uml-devel] [PATCH] UML - Fix incompatible types warning in previous SG fix

2007-10-29 Thread Jeff Dike 
From: WANG Cong <[EMAIL PROTECTED]>

Fix an incompatible-pointer warning.

Signed-off-by: WANG Cong <[EMAIL PROTECTED]>
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
---
 arch/um/drivers/ubd_kern.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/um/drivers/ubd_kern.c
===
--- linux-2.6.orig/arch/um/drivers/ubd_kern.c   2007-10-29 11:30:02.0 
-0400
+++ linux-2.6/arch/um/drivers/ubd_kern.c2007-10-29 12:06:46.0 
-0400
@@ -705,7 +705,7 @@ static int ubd_add(int n, char **error_o
ubd_dev->size = ROUND_BLOCK(ubd_dev->size);
 
INIT_LIST_HEAD(&ubd_dev->restart);
-   sg_init_table(&ubd_dev->sg, MAX_SG);
+   sg_init_table(ubd_dev->sg, MAX_SG);
 
err = -ENOMEM;
ubd_dev->queue = blk_init_queue(do_ubd_request, &ubd_dev->lock);

-
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
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

[uml-devel] [PATCH] Correctly strip kernel defines from userspace CFLAGS

2007-10-29 Thread Jeff Dike 
KERNEL_DEFINES needs whitespace trimmed, otherwise the whitespace
crunching done by make fools the patsubst which is used to remove
KERNEL_DEFINES from USER_CFLAGS.

Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
---
 arch/um/Makefile |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/um/Makefile
===
--- linux-2.6.orig/arch/um/Makefile 2007-10-22 16:19:38.0 -0400
+++ linux-2.6/arch/um/Makefile  2007-10-22 16:19:44.0 -0400
@@ -70,9 +70,12 @@ include $(srctree)/$(ARCH_DIR)/Makefile-
 # in KBUILD_CFLAGS.  Otherwise, it would cause ld to complain about the two 
different
 # errnos.
 # These apply to kernelspace only.
+#
+# strip leading and trailing whitespace to make the USER_CFLAGS removal of 
these
+# defines more robust
 
-KERNEL_DEFINES = -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
-   -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES)
+KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask 
\
+-Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
 KBUILD_CFLAGS += $(KERNEL_DEFINES)
 KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
 

-
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
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] [Git Patch] arch/um/os-Linux/: varied improvements and fixes

2007-10-29 Thread Jeff Dike 
On Sun, Oct 28, 2007 at 03:38:43PM +0800, WANG Cong wrote:
> This patch contains varied fixes and improvements for some files under
> arch/um/os-Linux/, such as a typo fix in a perror message, a missing
> argument fix for a printf, some constifying for pointers and so on.

Generally looks good, thanks.


>   printf("failed to install handler for signal %d - errno = %d\n",
> -errno);
> +sig, errno);

Nice spotting - I wonder why gcc didn't complain about this.

> - sigprocmask(on ? SIG_UNBLOCK : SIG_BLOCK, &sigset, &old);
> + if (sigprocmask(on ? SIG_UNBLOCK : SIG_BLOCK, &sigset, &old) < 0)
> + return -1;

In cases like this, I return -errno, not -1.  I'll fix this up.

Jeff

-- 
Work email - jdike at linux dot intel dot com

-
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
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel