From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>,
Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: linux-kernel@vger.kernel.org, pazke@donpac.ru,
linux-visws-devel@lists.sourceforge.net,
Chris Wright <chrisw@sous-sol.org>
Subject: [-mm patch] fix sgivwfb compile
Date: Wed, 28 Jun 2006 18:54:25 +0200 [thread overview]
Message-ID: <20060628165425.GK13915@stusta.de> (raw)
In-Reply-To: <20060624061914.202fbfb5.akpm@osdl.org>
This patch fixes the following compile error caused by
clean-up-and-refactor-i386-sub-architecture-setup.patch:
<-- snip -->
...
LD .tmp_vmlinux1
drivers/built-in.o: In function `sgivwfb_set_par':
sgivwfb.c:(.text+0x88583): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.text+0x88596): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.text+0x885a8): undefined reference to `sgivwfb_mem_phys'
drivers/built-in.o: In function `sgivwfb_check_var':
sgivwfb.c:(.text+0x88ad0): undefined reference to `sgivwfb_mem_size'
drivers/built-in.o: In function `sgivwfb_mmap':
sgivwfb.c:(.text+0x88c75): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.text+0x88c7f): undefined reference to `sgivwfb_mem_phys'
drivers/built-in.o: In function `sgivwfb_probe':
sgivwfb.c:(.init.text+0x4060): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x4065): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.init.text+0x4076): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.init.text+0x409c): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x410e): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x4113): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.init.text+0x4162): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x4168): undefined reference to `sgivwfb_mem_phys'
make: *** [.tmp_vmlinux1] Error 1
<-- snip -->
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
arch/i386/mach-visws/setup.c | 4 ++--
drivers/video/sgivwfb.c | 6 ++----
include/asm-i386/mach-visws/setup_arch.h | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
--- linux-2.6.17-mm2-full/include/asm-i386/mach-visws/setup_arch.h.old 2006-06-27 00:35:55.000000000 +0200
+++ linux-2.6.17-mm2-full/include/asm-i386/mach-visws/setup_arch.h 2006-06-27 00:36:10.000000000 +0200
@@ -1,5 +1,8 @@
/* Hook to call BIOS initialisation function */
+extern unsigned long sgivwfb_mem_phys;
+extern unsigned long sgivwfb_mem_size;
+
/* no action for visws */
#define ARCH_SETUP
--- linux-2.6.17-mm2-full/arch/i386/mach-visws/setup.c.old 2006-06-27 00:28:06.000000000 +0200
+++ linux-2.6.17-mm2-full/arch/i386/mach-visws/setup.c 2006-06-27 00:28:20.000000000 +0200
@@ -140,8 +140,8 @@
#define MB (1024 * 1024)
-static unsigned long sgivwfb_mem_phys;
-static unsigned long sgivwfb_mem_size;
+unsigned long sgivwfb_mem_phys;
+unsigned long sgivwfb_mem_size;
long long mem_size __initdata = 0;
--- linux-2.6.17-mm2-full/drivers/video/sgivwfb.c.old 2006-06-27 00:29:03.000000000 +0200
+++ linux-2.6.17-mm2-full/drivers/video/sgivwfb.c 2006-06-27 00:36:37.000000000 +0200
@@ -23,6 +23,8 @@
#include <asm/io.h>
#include <asm/mtrr.h>
+#include <setup_arch.h>
+
#define INCLUDE_TIMING_TABLE_DATA
#define DBE_REG_BASE par->regs
#include <video/sgivw.h>
@@ -42,10 +44,6 @@
* The default can be overridden if the driver is compiled as a module
*/
-/* set by arch/i386/kernel/setup.c */
-extern unsigned long sgivwfb_mem_phys;
-extern unsigned long sgivwfb_mem_size;
-
static int ypan = 0;
static int ywrap = 0;
next prev parent reply other threads:[~2006-06-28 16:54 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-24 13:19 2.6.17-mm2 Andrew Morton
2006-06-24 15:53 ` 2.6.17-mm2 Rafael J. Wysocki
2006-06-24 17:20 ` 2.6.17-mm2 Dave Jones
2006-06-24 21:34 ` 2.6.17-mm2 Andrew Morton
2006-06-25 8:51 ` 2.6.17-mm2 Rafael J. Wysocki
2006-06-25 10:22 ` 2.6.17-mm2 Andrew Morton
2006-06-25 15:16 ` 2.6.17-mm2 Andrew Morton
2006-06-25 18:23 ` 2.6.17-mm2 Sam Ravnborg
2006-06-25 18:40 ` 2.6.17-mm2 Andrew Morton
2006-06-25 21:21 ` 2.6.17-mm2 Sam Ravnborg
2006-06-30 7:38 ` 2.6.17-mm2 Randy.Dunlap
2006-07-02 10:11 ` 2.6.17-mm2 Russell King
2006-07-02 18:42 ` 2.6.17-mm2 Randy.Dunlap
2006-07-02 18:47 ` 2.6.17-mm2 Arjan van de Ven
2006-07-02 18:47 ` 2.6.17-mm2 Sam Ravnborg
2006-07-03 5:50 ` 2.6.17-mm2 Randy.Dunlap
2006-07-03 13:49 ` 2.6.17-mm2 Russell King
2006-06-25 19:19 ` 2.6.17-mm2 Rafael J. Wysocki
2006-06-26 20:13 ` 2.6.17-mm2 Chandra Seetharaman
2006-06-24 19:41 ` 2.6.17-mm2 Dominik Karall
2006-06-24 21:43 ` 2.6.17-mm2 Andrew Morton
2006-06-25 6:06 ` 2.6.17-mm2 Reuben Farrelly
2006-06-25 9:37 ` 2.6.17-mm2 Barry K. Nathan
2006-06-25 10:29 ` 2.6.17-mm2 Reuben Farrelly
2006-06-25 11:19 ` 2.6.17-mm2 Michal Piotrowski
2006-06-25 11:40 ` 2.6.17-mm2 Andrew Morton
2006-06-25 12:18 ` 2.6.17-mm2 Michal Piotrowski
2006-06-25 16:25 ` 2.6.17-mm2 (NULL pointer dereference) Dominik Karall
2006-06-25 17:18 ` Andrew Morton
2006-06-25 18:11 ` Dominik Karall
2006-06-25 16:47 ` 2.6.17-mm2: no QLA3YYY_NAPI help text Adrian Bunk
2006-06-25 19:32 ` 2.6.17-mm2: BLK_CPQ_CISS_DA=m error Adrian Bunk
2006-06-26 0:41 ` Vivek Goyal
2006-06-25 23:13 ` [-mm patch] make drivers/scsi/pata_it821x.c:it821x_passthru_dev_select() static Adrian Bunk
2006-06-25 23:27 ` Alan Cox
2006-06-27 1:03 ` Jeff Garzik
2006-06-25 23:13 ` [-mm patch] fs/cifs/cifsproto.h: remove #ifdef around small_smb_init_no_tc() prototype Adrian Bunk
2006-06-26 4:05 ` Steven French
2006-06-26 15:17 ` [-mm patch] drivers/scsi/arcmsr/: cleanups Adrian Bunk
2006-06-26 20:27 ` [-mm patch] drivers/md/raid5.c: remove an unused variable Adrian Bunk
2006-06-26 21:41 ` 2.6.17-mm2 hrtimer code wedges at boot? Valdis.Kletnieks
2006-06-26 22:50 ` Valdis.Kletnieks
2006-06-26 23:02 ` john stultz
2006-06-26 23:27 ` Thomas Gleixner
2006-06-27 2:12 ` Valdis.Kletnieks
2006-06-27 5:54 ` Thomas Gleixner
2006-06-27 10:16 ` Roman Zippel
2006-06-27 16:43 ` Valdis.Kletnieks
2006-06-27 17:10 ` Roman Zippel
2006-06-27 17:23 ` Roman Zippel
2006-06-27 19:07 ` Valdis.Kletnieks
2006-06-28 0:07 ` john stultz
2006-06-28 10:35 ` Roman Zippel
2006-06-28 11:44 ` Roman Zippel
2006-06-29 23:07 ` Valdis.Kletnieks
2006-06-30 19:26 ` john stultz
2006-06-30 21:04 ` Valdis.Kletnieks
2006-07-03 1:13 ` Roman Zippel
2006-07-03 1:56 ` Daniel Walker
2006-07-03 2:20 ` Valdis.Kletnieks
2006-07-03 20:08 ` john stultz
2006-07-03 19:59 ` john stultz
2006-07-04 22:21 ` Valdis.Kletnieks
2006-07-05 4:29 ` Valdis.Kletnieks
2006-07-06 0:37 ` Roman Zippel
2006-07-06 0:56 ` john stultz
2006-07-06 6:38 ` Valdis.Kletnieks
2006-07-06 0:51 ` john stultz
2006-07-06 1:12 ` john stultz
2006-07-06 5:43 ` john stultz
2006-07-06 20:33 ` Roman Zippel
2006-07-06 22:05 ` john stultz
2006-07-07 23:16 ` Roman Zippel
2006-07-08 20:02 ` [PATCH] adjust clock for lost ticks Roman Zippel
2006-07-09 21:25 ` john stultz
2006-06-28 23:41 ` 2.6.17-mm2 hrtimer code wedges at boot? john stultz
2006-06-29 11:24 ` Roman Zippel
2006-06-28 16:54 ` [-mm patch] include/asm-i386/acpi.h should #include <asm/processor.h> Adrian Bunk
2006-06-28 16:54 ` Adrian Bunk [this message]
2006-06-28 16:54 ` [-mm patch] arch/i386/mach-visws/setup.c: remove dummy function calls 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=20060628165425.GK13915@stusta.de \
--to=bunk@stusta.de \
--cc=akpm@osdl.org \
--cc=chrisw@sous-sol.org \
--cc=jeremy@xensource.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-visws-devel@lists.sourceforge.net \
--cc=pazke@donpac.ru \
/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.