From: BlaisorBlade <blaisorblade_spam@yahoo.it>
To: Jeff Dike <jdike@addtoit.com>,
user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] [PATCH] Rename headers with the same name
Date: Mon, 16 Feb 2004 19:21:10 +0100 [thread overview]
Message-ID: <200402161920.25522.blaisorblade_spam@yahoo.it> (raw)
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
With the current uml patch I get:
$ ls arch/um/kernel/*/include
arch/um/kernel/skas/include:
mmu.h mode.h mode_kern.h proc_mm.h ptrace-skas.h skas.h uaccess.h
arch/um/kernel/tt/include:
debug.h mmu.h mode.h mode_kern.h ptrace-tt.h tt.h uaccess.h
and we see that mmu.h, mode.h, mode_kern.h and uaccess.h have the same name,
so one cannot easily specify which one he wants to include. I'm attaching a
script to rename all the files at once (revert its effect with -r switch) and
a patch to correct references to them + fix any compile errors.
Bye
--
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729
[-- Attachment #2: RenameModeHeaders.patch --]
[-- Type: text/x-diff, Size: 1967 bytes --]
--- ./arch/um/include/um_uaccess.h.fix 2004-02-05 16:45:10.000000000 +0100
+++ ./arch/um/include/um_uaccess.h 2004-02-08 17:36:00.000000000 +0100
@@ -10,11 +10,11 @@
#include "choose-mode.h"
#ifdef CONFIG_MODE_TT
-#include "../kernel/tt/include/uaccess.h"
+#include "uaccess-tt.h"
#endif
#ifdef CONFIG_MODE_SKAS
-#include "../kernel/skas/include/uaccess.h"
+#include "uaccess-skas.h"
#endif
#define access_ok(type, addr, size) \
--- ./arch/um/include/mode_kern.h.fix 2003-12-20 17:20:03.000000000 +0100
+++ ./arch/um/include/mode_kern.h 2004-02-08 17:36:00.000000000 +0100
@@ -9,11 +9,11 @@
#include "linux/config.h"
#ifdef CONFIG_MODE_TT
-#include "../kernel/tt/include/mode_kern.h"
+#include "mode_kern-tt.h"
#endif
#ifdef CONFIG_MODE_SKAS
-#include "../kernel/skas/include/mode_kern.h"
+#include "mode_kern-skas.h"
#endif
#endif
--- ./arch/um/include/mode.h.fix 2003-12-20 17:40:55.000000000 +0100
+++ ./arch/um/include/mode.h 2004-02-08 17:36:00.000000000 +0100
@@ -9,11 +9,11 @@
#include "uml-config.h"
#ifdef UML_CONFIG_MODE_TT
-#include "../kernel/tt/include/mode.h"
+#include "mode-tt.h"
#endif
#ifdef UML_CONFIG_MODE_SKAS
-#include "../kernel/skas/include/mode.h"
+#include "mode-skas.h"
#endif
#endif
--- ./arch/um/include/um_mmu.h.fix 2003-12-20 17:20:03.000000000 +0100
+++ ./arch/um/include/um_mmu.h 2004-02-08 17:36:00.000000000 +0100
@@ -10,11 +10,11 @@
#include "choose-mode.h"
#ifdef CONFIG_MODE_TT
-#include "../kernel/tt/include/mmu.h"
+#include "mmu-tt.h"
#endif
#ifdef CONFIG_MODE_SKAS
-#include "../kernel/skas/include/mmu.h"
+#include "mmu-skas.h"
#endif
typedef union {
--- ./arch/um/kernel/skas/exec_kern.c.fix 2003-12-20 17:20:03.000000000 +0100
+++ ./arch/um/kernel/skas/exec_kern.c 2004-02-08 18:08:57.000000000 +0100
@@ -12,7 +12,7 @@
#include "asm/mmu_context.h"
#include "tlb.h"
#include "skas.h"
-#include "mmu.h"
+#include "um_mmu.h"
#include "os.h"
void flush_thread_skas(void)
[-- Attachment #3: RenameModeHeaders.sh --]
[-- Type: application/x-shellscript, Size: 268 bytes --]
reply other threads:[~2004-02-16 19:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200402161920.25522.blaisorblade_spam@yahoo.it \
--to=blaisorblade_spam@yahoo.it \
--cc=jdike@addtoit.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox