From: Piotr Neuman <sikkh@wp.pl>
To: user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] Quick and dirty patch for 2.6.5 + 2.6.4-um1 patch
Date: Wed, 7 Apr 2004 23:51:51 +0200 [thread overview]
Message-ID: <200404072351.51418.sikkh@wp.pl> (raw)
[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]
This is just a hack to compile 2.6.5 kernel + 2.6.4-um1 patch. As Jeff Dike
put it "you might post that to uml-devel for the impatient" ;), but it's not
official fix...
Here it goes:
diff -ruN linux/include/asm-i386/system.h uml/linux/include/asm-i386/system.h
--- linux/include/asm-i386/system.h 2004-04-07 23:29:03.000000000 +0200
+++ uml/linux/include/asm-i386/system.h 2004-04-07 23:24:39.000000000 +0200
@@ -243,6 +243,7 @@
#define __HAVE_ARCH_CMPXCHG 1
#endif
+#ifndef __UM_SYSTEM_I386_H
static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
unsigned long new, int size)
{
@@ -270,6 +271,8 @@
return old;
}
+#endif
+
#define cmpxchg(ptr,o,n)\
((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
(unsigned long)(n),sizeof(*(ptr))))
--- linux/arch/um/Makefile-i386 2004-04-07 23:29:20.521333000 +0200
+++ uml/linux/arch/um/Makefile-i386 2004-04-07 23:22:31.000000000 +0200
@@ -30,7 +30,7 @@
$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread
$(call filechk,$@)
-$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ;
+$(SYS_UTIL_DIR)/mk_sc: scripts/basic/fixdep include/config/MARKER FORCE ;
$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare
FORCE ;
[-- Attachment #2: 2.6.5-uml1.fix --]
[-- Type: text/x-diff, Size: 1116 bytes --]
diff -ruN linux/include/asm-i386/system.h uml/linux/include/asm-i386/system.h
--- linux/include/asm-i386/system.h 2004-04-07 23:29:03.000000000 +0200
+++ uml/linux/include/asm-i386/system.h 2004-04-07 23:24:39.000000000 +0200
@@ -243,6 +243,7 @@
#define __HAVE_ARCH_CMPXCHG 1
#endif
+#ifndef __UM_SYSTEM_I386_H
static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
unsigned long new, int size)
{
@@ -270,6 +271,8 @@
return old;
}
+#endif
+
#define cmpxchg(ptr,o,n)\
((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\
(unsigned long)(n),sizeof(*(ptr))))
--- linux/arch/um/Makefile-i386 2004-04-07 23:29:20.521333000 +0200
+++ uml/linux/arch/um/Makefile-i386 2004-04-07 23:22:31.000000000 +0200
@@ -30,7 +30,7 @@
$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread
$(call filechk,$@)
-$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ;
+$(SYS_UTIL_DIR)/mk_sc: scripts/basic/fixdep include/config/MARKER FORCE ;
$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ;
next reply other threads:[~2004-04-07 21:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-04-07 21:51 Piotr Neuman [this message]
2004-04-07 22:45 ` [uml-devel] Quick and dirty patch for 2.6.5 + 2.6.4-um1 patch Henrik Nordstrom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200404072351.51418.sikkh@wp.pl \
--to=sikkh@wp.pl \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.