From: Jeff Dike <jdike@addtoit.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Adrian Bunk <bunk@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
uml-devel <user-mode-linux-devel@lists.sourceforge.net>
Subject: [uml-devel] [PATCH 1/6] UML - Fix inlines
Date: Fri, 17 Aug 2007 15:43:40 -0400 [thread overview]
Message-ID: <20070817194340.GA8734@c2.user-mode-linux.org> (raw)
"extern inline" will have different semantics with gcc 4.3.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
--
include/asm-um/pgalloc.h | 2 +-
include/asm-um/pgtable-3level.h | 2 +-
include/asm-um/processor-x86_64.h | 2 +-
include/asm-um/smp.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: linux-2.6.22/include/asm-um/pgalloc.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/pgalloc.h 2007-08-13 22:38:59.000000000 -0400
+++ linux-2.6.22/include/asm-um/pgalloc.h 2007-08-16 12:04:12.000000000 -0400
@@ -42,7 +42,7 @@ static inline void pte_free(struct page
#ifdef CONFIG_3_LEVEL_PGTABLES
-extern __inline__ void pmd_free(pmd_t *pmd)
+static inline void pmd_free(pmd_t *pmd)
{
free_page((unsigned long)pmd);
}
Index: linux-2.6.22/include/asm-um/pgtable-3level.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/pgtable-3level.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/include/asm-um/pgtable-3level.h 2007-08-15 10:39:59.000000000 -0400
@@ -69,7 +69,7 @@ static inline pmd_t *pmd_alloc_one(struc
return pmd;
}
-extern inline void pud_clear (pud_t *pud)
+static inline void pud_clear (pud_t *pud)
{
set_pud(pud, __pud(0));
}
Index: linux-2.6.22/include/asm-um/processor-x86_64.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/processor-x86_64.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/include/asm-um/processor-x86_64.h 2007-08-15 10:39:59.000000000 -0400
@@ -18,7 +18,7 @@ struct arch_thread {
};
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
-extern inline void rep_nop(void)
+static inline void rep_nop(void)
{
__asm__ __volatile__("rep;nop": : :"memory");
}
Index: linux-2.6.22/include/asm-um/smp.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/smp.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/include/asm-um/smp.h 2007-08-15 10:39:59.000000000 -0400
@@ -18,7 +18,7 @@ extern int hard_smp_processor_id(void);
extern int ncpus;
-extern inline void smp_cpus_done(unsigned int maxcpus)
+static inline void smp_cpus_done(unsigned int maxcpus)
{
}
-------------------------------------------------------------------------
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
WARNING: multiple messages have this Message-ID (diff)
From: Jeff Dike <jdike@addtoit.com>
To: Andrew Morton <akpm@osdl.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
uml-devel <user-mode-linux-devel@lists.sourceforge.net>,
Adrian Bunk <bunk@kernel.org>
Subject: [PATCH 1/6] UML - Fix inlines
Date: Fri, 17 Aug 2007 15:43:40 -0400 [thread overview]
Message-ID: <20070817194340.GA8734@c2.user-mode-linux.org> (raw)
"extern inline" will have different semantics with gcc 4.3.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
--
include/asm-um/pgalloc.h | 2 +-
include/asm-um/pgtable-3level.h | 2 +-
include/asm-um/processor-x86_64.h | 2 +-
include/asm-um/smp.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Index: linux-2.6.22/include/asm-um/pgalloc.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/pgalloc.h 2007-08-13 22:38:59.000000000 -0400
+++ linux-2.6.22/include/asm-um/pgalloc.h 2007-08-16 12:04:12.000000000 -0400
@@ -42,7 +42,7 @@ static inline void pte_free(struct page
#ifdef CONFIG_3_LEVEL_PGTABLES
-extern __inline__ void pmd_free(pmd_t *pmd)
+static inline void pmd_free(pmd_t *pmd)
{
free_page((unsigned long)pmd);
}
Index: linux-2.6.22/include/asm-um/pgtable-3level.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/pgtable-3level.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/include/asm-um/pgtable-3level.h 2007-08-15 10:39:59.000000000 -0400
@@ -69,7 +69,7 @@ static inline pmd_t *pmd_alloc_one(struc
return pmd;
}
-extern inline void pud_clear (pud_t *pud)
+static inline void pud_clear (pud_t *pud)
{
set_pud(pud, __pud(0));
}
Index: linux-2.6.22/include/asm-um/processor-x86_64.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/processor-x86_64.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/include/asm-um/processor-x86_64.h 2007-08-15 10:39:59.000000000 -0400
@@ -18,7 +18,7 @@ struct arch_thread {
};
/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
-extern inline void rep_nop(void)
+static inline void rep_nop(void)
{
__asm__ __volatile__("rep;nop": : :"memory");
}
Index: linux-2.6.22/include/asm-um/smp.h
===================================================================
--- linux-2.6.22.orig/include/asm-um/smp.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/include/asm-um/smp.h 2007-08-15 10:39:59.000000000 -0400
@@ -18,7 +18,7 @@ extern int hard_smp_processor_id(void);
extern int ncpus;
-extern inline void smp_cpus_done(unsigned int maxcpus)
+static inline void smp_cpus_done(unsigned int maxcpus)
{
}
next reply other threads:[~2007-08-18 0:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-17 19:43 Jeff Dike [this message]
2007-08-17 19:43 ` [PATCH 1/6] UML - Fix inlines Jeff Dike
2007-08-20 19:40 ` [uml-devel] " Andrew Morton
2007-08-20 19:40 ` Andrew Morton
2007-08-20 19:55 ` [uml-devel] " Adrian Bunk
2007-08-20 19:55 ` Adrian Bunk
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=20070817194340.GA8734@c2.user-mode-linux.org \
--to=jdike@addtoit.com \
--cc=akpm@osdl.org \
--cc=bunk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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.