Re: 2.6.7-rc3-mm2

William Lee Irwin III
2004-06-14T11:55:32Z

On Mon, Jun 14, 2004 at 04:15:40AM -0700, William Lee Irwin III wrote:
>> The arrangement of the #include <linux/kernel.h> in list.h breaks the
>> build of documentation. The following patch moves the include to where
>> it no longer interferes with kerneldoc's operation.

On Mon, Jun 14, 2004 at 12:50:04PM +0100, Christoph Hellwig wrote:
> BUG_ON is in <asm/bug.h>, no need to pull in all the crap from kernel.h

Revised patch, then:

Index: debian-2.6.7-rc3/include/linux/list.h
===================================================================
--- debian-2.6.7-rc3.orig/include/linux/list.h 2004-06-14 03:18:03.000000000 -0700
+++ debian-2.6.7-rc3/include/linux/list.h 2004-06-14 04:06:36.000000000 -0700
@@ -5,6 +5,7 @@

#include <linux/stddef.h>
#include <linux/prefetch.h>
+#include <asm/bug.h> /* BUG_ON */
#include <asm/system.h>

/*
@@ -158,7 +159,6 @@
* Note: list_empty on entry does not return true after this, the entry is
* in an undefined state.
*/
-#include <linux/kernel.h> /* BUG_ON */
static inline void list_del(struct list_head *entry)
{
BUG_ON(entry->prev->next != entry);