[pkg-nvidia-devel] need patch for 190.32 (beta) support

[Lennart Sorensen]

On Tue, Sep 22, 2009 at 06:16:13PM +0200, Andreas Beckmann wrote:
> Hi,
> 
> I just tried the NVIDIA 190.32 beta driver and found the following new
> part in conftest.sh that needs to be ported to Debian's conftest.h:
> 
> > +      INIT_WORK)
> > +            #
> > +            # Determine how many arguments INIT_WORK() macro
> > +            # takes.
> > +            #
> > +            echo "$CONFTEST_PREAMBLE
> > +            #include <linux/workqueue.h>
> > +            void conftest_INIT_WORK(void) {
> > +                INIT_WORK((struct work_struct *)NULL, NULL, NULL);
> > +            }" > conftest$$.c
> > +
> > +            #$CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
> > +            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
> > +            rm -f conftest$$.c
> > +
> > +            if [ -f conftest$$.o ]; then
> > +                echo "#define NV_INIT_WORK_PRESENT" >> conftest.h
> > +                echo "#define NV_INIT_WORK_ARGUMENT_COUNT 3" >> conftest.h
> > +                rm -f conftest$$.o
> > +                return
> > +            fi
> > +
> > +            echo "$CONFTEST_PREAMBLE
> > +            #include <linux/workqueue.h>
> > +            void conftest_INIT_WORK(void) {
> > +                INIT_WORK((struct work_struct *)NULL, NULL);
> > +            }" > conftest$$.c
> > +
> > +            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
> > +            rm -f conftest$$.c
> > +
> > +            if [ -f conftest$$.o ]; then
> > +                echo "#define NV_INIT_WORK_PRESENT" >> conftest.h
> > +                echo "#define NV_INIT_WORK_ARGUMENT_COUNT 2" >> conftest.h
> > +                rm -f conftest$$.o
> > +                return
> > +            else
> > +                echo "#error INIT_WORK() conftest failed!" >> conftest.h
> > +                return
> > +            fi
> > +        ;;
> 
> My suggested patch for conftest.h is to append the following lines:
> 
>     /* Implement conftest.sh function INIT_WORK */
>     #define NV_INIT_WORK_PRESENT
>     #define NV_INIT_WORK_ARGUMENT_COUNT 2
> 
> I checked 2.6.26, 2.6.29, 2.6.30, 2.6.31, all of them have a
> two-argument INIT_WORK() macro in linux/workqueue.h.
> 
> If this is OK, I'll prepare a patch for the package.

But which version does _not_ have it?  That's the key to doing it right.

-- 
Len Sorensen