[Pkg-uml-commit] r328 - trunk/src/user-mode-linux/debian/patches

malattia at alioth.debian.org malattia at alioth.debian.org
Sat Aug 9 05:58:16 UTC 2008


Author: malattia
Date: 2008-08-09 05:58:15 +0000 (Sat, 09 Aug 2008)
New Revision: 328

Removed:
   trunk/src/user-mode-linux/debian/patches/01_uml_net.patch
   trunk/src/user-mode-linux/debian/patches/04_workaround_gcc4.3_ICE.patch
   trunk/src/user-mode-linux/debian/patches/05_down_interruptible_asmregparam.patch
   trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch
   trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch
Modified:
   trunk/src/user-mode-linux/debian/patches/series
Log:
- remove 08_fix_ptrace_crash.patch included in the current stable release
- remove unused (already merged upstream) patches


Deleted: trunk/src/user-mode-linux/debian/patches/01_uml_net.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/01_uml_net.patch	2008-08-09 05:56:59 UTC (rev 327)
+++ trunk/src/user-mode-linux/debian/patches/01_uml_net.patch	2008-08-09 05:58:15 UTC (rev 328)
@@ -1,47 +0,0 @@
-# Mattia Dongili <malattia at debian.org>
-# Use Debian's standard location for uml_net helper
---- a/arch/um/os-Linux/main.c
-+++ b/arch/um/os-Linux/main.c
-@@ -74,6 +74,33 @@ static void last_ditch_exit(int sig)
- 	exit(1);
- }
- 
-+#define UML_LIB_PATH	":/usr/lib/uml"
-+
-+static void setup_env_path(void) {
-+	char *new_path = NULL;
-+	char *old_path = NULL;
-+	int path_len = 0;
-+
-+	old_path = getenv("PATH");
-+	/* if no PATH variable is set or it has an empty value
-+	 * just use the default + /usr/lib/uml
-+	 */
-+	if (!old_path || (path_len = strlen(old_path)) == 0) {
-+		putenv("PATH=:/bin:/usr/bin/" UML_LIB_PATH);
-+		return;
-+	}
-+
-+	/* append /usr/lib/uml to the existing path */
-+	path_len += strlen("PATH=" UML_LIB_PATH) + 1;
-+	new_path = malloc(path_len);
-+	if (!new_path) {
-+		perror("coudn't malloc to set a new PATH");
-+		return;
-+	}
-+	snprintf(new_path, path_len, "PATH=%s" UML_LIB_PATH, old_path);
-+	putenv(new_path);
-+}
-+
- extern int uml_exitcode;
- 
- extern void scan_elf_aux( char **envp);
-@@ -114,6 +141,8 @@ int main(int argc, char **argv, char **e
- 
- 	set_stklim();
- 
-+	setup_env_path();
-+
- 	new_argv = malloc((argc + 1) * sizeof(char *));
- 	if(new_argv == NULL){
- 		perror("Mallocing argv");

Deleted: trunk/src/user-mode-linux/debian/patches/04_workaround_gcc4.3_ICE.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/04_workaround_gcc4.3_ICE.patch	2008-08-09 05:56:59 UTC (rev 327)
+++ trunk/src/user-mode-linux/debian/patches/04_workaround_gcc4.3_ICE.patch	2008-08-09 05:58:15 UTC (rev 328)
@@ -1,77 +0,0 @@
-[ This patch needs to get into 2.6.26 ]
-
-There are various constraints on the use of unit-at-a-time:
-        i386 uses no-unit-at-a-time for pre-4.0 (not 4.3)
-        x86_64 uses unit-at-a-time always
-
-        Uli reported a crash on x86_64 with gcc 4.1.2 with
-unit-at-a-time, resulting in commit c0a18111e571138747a98af18b3a2124df56a0d1
-        Ingo reported a gcc internal error with gcc 4.3 with
-no-unit-at-a-timem, resulting in 22eecde2f9034764a3fd095eecfa3adfb8ec9a98
-         Benny Halevy <bhalevy at panasas.com> is seeing extern inlines
-not resolved with gcc 4.3 with no-unit-at-a-time
-
-This patch reintroduces unit-at-a-time for gcc >= 4.0, bringing back
-the possibility of Uli's crash.  If that happens, we'll debug it.
-
-I started seeing both the internal compiler errors and unresolved
-inlines on Fedora 9.  This patch fixes both problems, without so far
-reintroducing the crash reported by Uli.
-	
-Signed-off-by: Jeff Dike <jdike at linux.intel.com>
----
- arch/um/Makefile        |    1 -
- arch/um/Makefile-i386   |    7 +++++++
- arch/um/Makefile-x86_64 |    3 +++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.22/arch/um/Makefile-i386
-===================================================================
---- linux-2.6.22.orig/arch/um/Makefile-i386	2008-05-29 11:21:25.000000000 -0400
-+++ linux-2.6.22/arch/um/Makefile-i386	2008-07-07 13:11:10.000000000 -0400
-@@ -32,4 +32,11 @@ cflags-y += $(call cc-option,-mpreferred
- # an unresolved reference.
- cflags-y += -ffreestanding
- 
-+# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
-+# a lot more stack due to the lack of sharing of stacklots.  Also, gcc
-+# 4.3.0 needs -funit-at-a-time for extern inline functions.
-+KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
-+			echo $(call cc-option,-fno-unit-at-a-time); \
-+			else echo $(call cc-option,-funit-at-a-time); fi ;)
-+
- KBUILD_CFLAGS += $(cflags-y)
-Index: linux-2.6.22/arch/um/Makefile-x86_64
-===================================================================
---- linux-2.6.22.orig/arch/um/Makefile-x86_64	2008-05-29 11:21:25.000000000 -0400
-+++ linux-2.6.22/arch/um/Makefile-x86_64	2008-06-30 12:21:01.000000000 -0400
-@@ -21,3 +21,6 @@ HEADER_ARCH := x86
- 
- LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
- LINK-y += -m64
-+
-+# Do unit-at-a-time unconditionally on x86_64, following the host
-+KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)
-Index: linux-2.6.22/arch/um/Makefile
-===================================================================
---- linux-2.6.22.orig/arch/um/Makefile	2008-06-10 11:35:40.000000000 -0400
-+++ linux-2.6.22/arch/um/Makefile	2008-07-07 12:54:13.000000000 -0400
-@@ -77,7 +77,6 @@ include $(srctree)/$(ARCH_DIR)/Makefile-
- 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,)
- 
- PHONY += linux
- 
-
--------------------------------------------------------------------------
-Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
-Studies have shown that voting for your favorite open source project,
-along with a healthy diet, reduces your potential for chronic lameness
-and boredom. Vote Now at http://www.sourceforge.net/community/cca08
-_______________________________________________
-User-mode-linux-devel mailing list
-User-mode-linux-devel at lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
-

Deleted: trunk/src/user-mode-linux/debian/patches/05_down_interruptible_asmregparam.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/05_down_interruptible_asmregparam.patch	2008-08-09 05:56:59 UTC (rev 327)
+++ trunk/src/user-mode-linux/debian/patches/05_down_interruptible_asmregparam.patch	2008-08-09 05:58:15 UTC (rev 328)
@@ -1,42 +0,0 @@
-The patch below solves the 2.6.25 uml crash problem for me. Looks like the
-problem should be away in 2.6.26 kernel because down_interruptible has
-changed to the C code since 2.6.26. But I got kernel panic while booting
-the 2.6.26 kernel :(.
-
-Index: linux-source-2.6.25/lib/semaphore-sleepers.c
-===================================================================
---- linux-source-2.6.25.orig/lib/semaphore-sleepers.c	2008-04-17 11:49:44.000000000 +0900
-+++ linux-source-2.6.25/lib/semaphore-sleepers.c	2008-07-19 14:54:18.275652685 +0900
-@@ -48,12 +48,12 @@
-  *    we cannot lose wakeup events.
-  */
- 
--void __up(struct semaphore *sem)
-+asmregparm void __up(struct semaphore *sem)
- {
- 	wake_up(&sem->wait);
- }
- 
--void __sched __down(struct semaphore *sem)
-+asmregparm void __sched __down(struct semaphore *sem)
- {
- 	struct task_struct *tsk = current;
- 	DECLARE_WAITQUEUE(wait, tsk);
-@@ -90,7 +90,7 @@ void __sched __down(struct semaphore *se
- 	tsk->state = TASK_RUNNING;
- }
- 
--int __sched __down_interruptible(struct semaphore *sem)
-+asmregparm int __sched __down_interruptible(struct semaphore *sem)
- {
- 	int retval = 0;
- 	struct task_struct *tsk = current;
-@@ -153,7 +153,7 @@ int __sched __down_interruptible(struct 
-  * single "cmpxchg" without failure cases,
-  * but then it wouldn't work on a 386.
-  */
--int __down_trylock(struct semaphore *sem)
-+asmregparm int __down_trylock(struct semaphore *sem)
- {
- 	int sleepers;
- 	unsigned long flags;

Deleted: trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch	2008-08-09 05:56:59 UTC (rev 327)
+++ trunk/src/user-mode-linux/debian/patches/06_conditionally_export_memcpy.patch	2008-08-09 05:58:15 UTC (rev 328)
@@ -1,25 +0,0 @@
-Backport a build fix on x86_64 (8bfd04b974689f700bbd053ad6e66b0a95fb80c9)
-
-From: Jeff Dike <jdike at linux.intel.com>
-
-x86_64 defines either memcpy or __memcpy depending on the gcc version, and
-it looks like UML needs to follow that in its exporting.
-
-Cc: Gabriel C <nix.or.die at googlemail.com>
-Signed-off-by: Jeff Dike <jdike at linux.intel.com>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-
-Index: linux-source-2.6.25/arch/um/sys-x86_64/ksyms.c
-===================================================================
---- linux-source-2.6.25.orig/arch/um/sys-x86_64/ksyms.c	2008-07-24 07:02:07.607642178 +0900
-+++ linux-source-2.6.25/arch/um/sys-x86_64/ksyms.c	2008-07-24 07:10:42.959643438 +0900
-@@ -13,4 +13,8 @@ EXPORT_SYMBOL(__down_failed_trylock);
- EXPORT_SYMBOL(__up_wakeup);
- 
- /*XXX: we need them because they would be exported by x86_64 */
-+#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
-+EXPORT_SYMBOL(memcpy);
-+#else
- EXPORT_SYMBOL(__memcpy);
-+#endif

Deleted: trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch
===================================================================
--- trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch	2008-08-09 05:56:59 UTC (rev 327)
+++ trunk/src/user-mode-linux/debian/patches/08_fix_ptrace_crash.patch	2008-08-09 05:58:15 UTC (rev 328)
@@ -1,50 +0,0 @@
-My copying of linux/init.h didn't go far enough.  The definition of
-__used singled out gcc minor version 3, but didn't care what the major
-version was.  This broke when unit-at-a-time was added and gcc started
-throwing out initcalls.
-
-This results in an early boot crash when ptrace tries to initialize a
-process with an empty, uninitialized register set.
-
-Signed-off-by: Jeff Dike <jdike at linux.intel.com>
----
- arch/um/include/init.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: linux-2.6.22/arch/um/include/init.h
-===================================================================
---- linux-2.6.22.orig/arch/um/include/init.h	2008-02-18 11:53:50.000000000 -0500
-+++ linux-2.6.22/arch/um/include/init.h	2008-07-20 18:06:35.000000000 -0400
-@@ -45,6 +45,8 @@ typedef void (*exitcall_t)(void);
- # define __section(S) __attribute__ ((__section__(#S)))
- #endif
- 
-+#if __GNUC__ == 3
-+
- #if __GNUC_MINOR__ >= 3
- # define __used			__attribute__((__used__))
- #else
-@@ -52,6 +54,12 @@ typedef void (*exitcall_t)(void);
- #endif
- 
- #else
-+#if __GNUC__ == 4
-+# define __used			__attribute__((__used__))
-+#endif
-+#endif
-+
-+#else
- #include <linux/compiler.h>
- #endif
- /* These are for everybody (although not all archs will actually
-
--------------------------------------------------------------------------
-This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
-Build the coolest Linux based applications with Moblin SDK & win great prizes
-Grand prize is a trip for two to an Open Source event anywhere in the world
-http://moblin-contest.org/redirect.php?banner_id=100&url=/
-_______________________________________________
-User-mode-linux-devel mailing list
-User-mode-linux-devel at lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
-

Modified: trunk/src/user-mode-linux/debian/patches/series
===================================================================
--- trunk/src/user-mode-linux/debian/patches/series	2008-08-09 05:56:59 UTC (rev 327)
+++ trunk/src/user-mode-linux/debian/patches/series	2008-08-09 05:58:15 UTC (rev 328)
@@ -1,7 +1,3 @@
 02_x-terminal-emulator.patch
 03_uml_switch.patch
-#04_workaround_gcc4.3_ICE.patch
-#05_down_interruptible_asmregparam.patch
-#06_conditionally_export_memcpy.patch
 07_vde_user_build_fix.patch
-08_fix_ptrace_crash.patch




More information about the Pkg-uml-commit mailing list