2012-02-16 05:29:13

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the final tree (fbdev tree related)

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/video/i740fb.c: In function 'i740fb_remove':
drivers/video/i740fb.c:1192:7: error: 'par' undeclared (first use in this function)

Caused by commit 5350c65f4f15 ("Resurrect Intel740 driver: i740fb") from
the fbdev tree. CONFIG_MTRR is not defined for this build ...

I have reverted that commit for today.
--
Cheers,
Stephen Rothwell [email protected]

Attachments:
(No filename) (489.00 B)
 (No filename) (836.00 B)
 Download all attachments
Subject: [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected

Signed-off-by: Florian Tobias Schandinat <[email protected]>
---
drivers/video/i740fb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
index 8be0302..fe574d8 100644
--- a/drivers/video/i740fb.c
+++ b/drivers/video/i740fb.c
@@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev *dev)
struct fb_info *info = pci_get_drvdata(dev);

if (info) {
-#ifdef CONFIG_MTRR
struct i740fb_par *par = info->par;

+#ifdef CONFIG_MTRR
if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0);
par->mtrr_reg = -1;
--
1.7.2.5

2012-02-20 20:50:40

by Ondrej Zary

[permalink] [raw]
Subject: Re: [PATCH] i740fb: fix compile error when CONFIG_MTRR is not selected

On Sunday 19 February 2012 22:33:31 Florian Tobias Schandinat wrote:
> Signed-off-by: Florian Tobias Schandinat <[email protected]>
> ---
> drivers/video/i740fb.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c
> index 8be0302..fe574d8 100644
> --- a/drivers/video/i740fb.c
> +++ b/drivers/video/i740fb.c
> @@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev
> *dev) struct fb_info *info = pci_get_drvdata(dev);
>
> if (info) {
> -#ifdef CONFIG_MTRR
> struct i740fb_par *par = info->par;
>
> +#ifdef CONFIG_MTRR
> if (par->mtrr_reg >= 0) {
> mtrr_del(par->mtrr_reg, 0, 0);
> par->mtrr_reg = -1;

Thanks for fixing my stupid bug. I thought that I tested it without
CONFIG_MTRR. But obviously didn't.

--
Ondrej Zary