[nouveau:master 10/52] drivers/gpu/drm/nouveau/nouveau_drv.h:552:8: error: redefinition of 'struct n

Hi Ben,

Kernel build failed on

tree:   git://git.freedesktop.org/git/nouveau/linux-2.6 master
head:   05d2e4d6fcab0991c2d1682111a5447c65f9277a
commit: 3d3c15c336a63d2dc81117a4d5ce0b2ff713490c [10/52] drm/nouveau: implement module init functions in nouveau_drm.c
config: x86_64-randconfig-b135 (attached as .config)

All related error/warning messages:

In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:552:8: error: redefinition of 'struct nouveau_engine'
In file included from drivers/gpu/drm/nouveau/core/include/core/device.h:6:0,
                 from drivers/gpu/drm/nouveau/core/include/core/parent.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:
drivers/gpu/drm/nouveau/core/include/core/engine.h:10:8: note: originally defined here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:652:2: error: redeclaration of enumerator 'NV_04'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:57:3: note: previous definition of 'NV_04' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:653:2: error: redeclaration of enumerator 'NV_10'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:58:3: note: previous definition of 'NV_10' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:654:2: error: redeclaration of enumerator 'NV_20'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:59:3: note: previous definition of 'NV_20' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:655:2: error: redeclaration of enumerator 'NV_30'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:60:3: note: previous definition of 'NV_30' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:656:2: error: redeclaration of enumerator 'NV_40'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:61:3: note: previous definition of 'NV_40' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:657:2: error: redeclaration of enumerator 'NV_50'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
--
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:552:8: error: redefinition of 'struct nouveau_engine'
In file included from drivers/gpu/drm/nouveau/core/include/core/device.h:6:0,
                 from drivers/gpu/drm/nouveau/core/include/core/parent.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:
drivers/gpu/drm/nouveau/core/include/core/engine.h:10:8: note: originally defined here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:652:2: error: redeclaration of enumerator 'NV_04'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:57:3: note: previous definition of 'NV_04' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:653:2: error: redeclaration of enumerator 'NV_10'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:58:3: note: previous definition of 'NV_10' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:654:2: error: redeclaration of enumerator 'NV_20'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:59:3: note: previous definition of 'NV_20' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:655:2: error: redeclaration of enumerator 'NV_30'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:60:3: note: previous definition of 'NV_30' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:656:2: error: redeclaration of enumerator 'NV_40'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
                 from drivers/gpu/drm/nouveau/nouveau_drv.h:62,
                 from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:
drivers/gpu/drm/nouveau/core/include/core/device.h:61:3: note: previous definition of 'NV_40' was here
In file included from drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c:29:0:
drivers/gpu/drm/nouveau/nouveau_drv.h:657:2: error: redeclaration of enumerator 'NV_50'
In file included from drivers/gpu/drm/nouveau/core/include/core/parent.h:4:0,
                 from drivers/gpu/drm/nouveau/core/include/core/namedb.h:4,
                 from drivers/gpu/drm/nouveau/core/include/core/client.h:4,
                 from drivers/gpu/drm/nouveau/nouveau_drm.h:5,
..

vim +552 drivers/gpu/drm/nouveau/nouveau_drv.h
   549		bool (*flags_valid)(struct drm_device *, u32 tile_flags);
   550	};
   551	
 > 552	struct nouveau_engine {
   553		struct nouveau_instmem_engine instmem;
   554		struct nouveau_mc_engine      mc;
   555		struct nouveau_timer_engine   timer;

---
0-DAY kernel build testing backend         Open Source Technology Centre
Fengguang Wu [off-list ref]                     Intel Corporation