Am 2012-04-18 15:25, schrieb walt: > Hey, I just pulled from Linus again and emerged nvidia-drivers and I see > that the test for kernel version no longer fails. The rest of the fix is > trivial now: > > diff -ur kernel/nv-linux.h nvidia/nv-linux.h > --- kernel/nv-linux.h 2012-04-05 21:37:05.000000000 -0700 > +++ nvidia/nv-linux.h 2012-04-12 06:58:31.000000000 -0700 > @@ -111,7 +111,6 @@ > #include <linux/timer.h> > > #include <asm/div64.h> /* do_div() */ > -#include <asm/system.h> /* cli, sli, save_flags */ > #include <asm/io.h> /* ioremap, virt_to_phys */ > #include <asm/uaccess.h> /* access_ok */ > #include <asm/page.h> /* PAGE_OFFSET */ > @@ -1204,7 +1203,6 @@ > #endif > > #if !defined(KERNEL_2_4) && !defined(NV_PM_MESSAGE_T_PRESENT) > -typedef u32 pm_message_t; > #endif > > #if defined(KERNEL_2_4) && (defined(CONFIG_APM) || > defined(CONFIG_APM_MODULE)) > > This works because a recent kernel commit removed system.h completely and now > the #include system.h is not needed. Also, any time you see a "previously > defined" error you can try to work around it by deleting the #include that > introduced the "previous definition" in the first place. May work, may not, > but it's always worth trying. This time it worked :)
Yes, my fix was nearly the same. I removed the same include as you in nv-linux.h, additionally one in conftest.sh (also including system.h). Worked ok on my ~amd64 with git-sources-3.4.0-rc3 now for the vmware-modules ;-) Stefan
