From: "Jan Beulich" <JBeulich@novell.com>
To: "Gerd Knorr" <kraxel@suse.de>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH] allow vesafb to build when no CONFIG_MTRR
Date: Tue, 21 Jun 2005 04:07:14 -0600 [thread overview]
Message-ID: <42B802F2020000780001CEAB@lyle.provo.novell.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1764 bytes --]
(Note: Patch also attached because the inline version is certain to get
line wrapped.)
vesafb didn't build when CONFIG_MTRR wasn't set.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- /home/jbeulich/tmp/linux-2.6.12/drivers/video/vesafb.c 2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/video/vesafb.c 2005-06-21 09:56:14.572032960 +0200
@@ -45,7 +45,9 @@ static struct fb_fix_screeninfo vesafb_f
};
static int inverse = 0;
+#ifdef CONFIG_MTRR
static int mtrr = 1;
+#endif
static int vram_remap __initdata = 0; /* Set amount of memory to be used */
static int vram_total __initdata = 0; /* Set total amount of memory */
static int pmi_setpal = 0; /* pmi for palette changes ??? */
@@ -204,10 +206,12 @@ static int __init vesafb_setup(char *opt
pmi_setpal=0;
else if (! strcmp(this_opt, "pmipal"))
pmi_setpal=1;
+#ifdef CONFIG_MTRR
else if (! strcmp(this_opt, "mtrr"))
mtrr=1;
else if (! strcmp(this_opt, "nomtrr"))
mtrr=0;
+#endif
else if (! strncmp(this_opt, "vtotal:", 7))
vram_total = simple_strtoul(this_opt+7, NULL, 0);
else if (! strncmp(this_opt, "vremap:", 7))
@@ -385,8 +389,9 @@ static int __init vesafb_probe(struct de
* region already (FIXME) */
request_region(0x3c0, 32, "vesafb");
+#ifdef CONFIG_MTRR
if (mtrr) {
- int temp_size = size_total;
+ unsigned int temp_size = size_total;
/* Find the largest power-of-two */
while (temp_size & (temp_size - 1))
temp_size &= (temp_size - 1);
@@ -396,6 +401,7 @@ static int __init vesafb_probe(struct de
temp_size >>= 1;
}
}
+#endif
info->fbops = &vesafb_ops;
info->var = vesafb_defined;
[-- Attachment #2: linux-2.6.12-vesafb-no-mtrr.patch --]
[-- Type: application/octet-stream, Size: 1709 bytes --]
(Note: Patch also attached because the inline version is certain to get
line wrapped.)
vesafb didn't build when CONFIG_MTRR wasn't set.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- /home/jbeulich/tmp/linux-2.6.12/drivers/video/vesafb.c 2005-06-17 21:48:29.000000000 +0200
+++ 2.6.12/drivers/video/vesafb.c 2005-06-21 09:56:14.572032960 +0200
@@ -45,7 +45,9 @@ static struct fb_fix_screeninfo vesafb_f
};
static int inverse = 0;
+#ifdef CONFIG_MTRR
static int mtrr = 1;
+#endif
static int vram_remap __initdata = 0; /* Set amount of memory to be used */
static int vram_total __initdata = 0; /* Set total amount of memory */
static int pmi_setpal = 0; /* pmi for palette changes ??? */
@@ -204,10 +206,12 @@ static int __init vesafb_setup(char *opt
pmi_setpal=0;
else if (! strcmp(this_opt, "pmipal"))
pmi_setpal=1;
+#ifdef CONFIG_MTRR
else if (! strcmp(this_opt, "mtrr"))
mtrr=1;
else if (! strcmp(this_opt, "nomtrr"))
mtrr=0;
+#endif
else if (! strncmp(this_opt, "vtotal:", 7))
vram_total = simple_strtoul(this_opt+7, NULL, 0);
else if (! strncmp(this_opt, "vremap:", 7))
@@ -385,8 +389,9 @@ static int __init vesafb_probe(struct de
* region already (FIXME) */
request_region(0x3c0, 32, "vesafb");
+#ifdef CONFIG_MTRR
if (mtrr) {
- int temp_size = size_total;
+ unsigned int temp_size = size_total;
/* Find the largest power-of-two */
while (temp_size & (temp_size - 1))
temp_size &= (temp_size - 1);
@@ -396,6 +401,7 @@ static int __init vesafb_probe(struct de
temp_size >>= 1;
}
}
+#endif
info->fbops = &vesafb_ops;
info->var = vesafb_defined;
next reply other threads:[~2005-06-21 11:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-21 10:07 Jan Beulich [this message]
2005-06-21 11:14 ` Gerd Knorr
2005-06-21 12:25 Jan Beulich
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=42B802F2020000780001CEAB@lyle.provo.novell.com \
--to=jbeulich@novell.com \
--cc=kraxel@suse.de \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®