Re: [patch 1/6] DocBook: changes and extensions to the kernel documentation

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Martin Waitz wrote:
--- linux-docbook.orig/drivers/video/fbmem.c	2005-04-06 12:13:12.674832161 +0200
+++ linux-docbook/drivers/video/fbmem.c	2005-04-06 12:24:11.946113964 +0200
@@ -1257,6 +1257,8 @@ int fb_new_modelist(struct fb_info *info
 static char *video_options[FB_MAX];
 static int ofonly;
+extern const char *global_mode_option;
+
 /**
  * fb_get_options - get kernel boot parameters
  * @name:   framebuffer name as it would appear in
@@ -1297,9 +1299,6 @@ int fb_get_options(char *name, char **op
 	return retval;
 }
-
-extern const char *global_mode_option;
-
 /**
  *	video_setup - process command line options
  *	@options: string of options
Index: linux-docbook/include/linux/skbuff.h
===================================================================
--- linux-docbook.orig/include/linux/skbuff.h	2005-04-06 12:13:12.677831708 +0200
+++ linux-docbook/include/linux/skbuff.h	2005-04-06 12:24:11.954112753 +0200
@@ -974,6 +974,7 @@ static inline void __skb_queue_purge(str
 		kfree_skb(skb);
 }
+#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB
 /**
  *	__dev_alloc_skb - allocate an skbuff for sending
  *	@length: length to allocate
@@ -986,7 +987,6 @@ static inline void __skb_queue_purge(str
  *
  *	%NULL is returned in there is no free memory.
  */
-#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB
 static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
 					      int gfp_mask)
 {
Index: linux-docbook/mm/vmalloc.c
===================================================================
--- linux-docbook.orig/mm/vmalloc.c	2005-04-06 12:13:12.680831254 +0200
+++ linux-docbook/mm/vmalloc.c	2005-04-06 12:24:11.963111391 +0200
@@ -475,6 +475,10 @@ void *vmalloc(unsigned long size)
EXPORT_SYMBOL(vmalloc); +#ifndef PAGE_KERNEL_EXEC
+# define PAGE_KERNEL_EXEC PAGE_KERNEL
+#endif
+
 /**
  *	vmalloc_exec  -  allocate virtually contiguous, executable memory
  *
@@ -488,10 +492,6 @@ EXPORT_SYMBOL(vmalloc);
  *	use __vmalloc() instead.
  */
-#ifndef PAGE_KERNEL_EXEC
-# define PAGE_KERNEL_EXEC PAGE_KERNEL
-#endif
-
 void *vmalloc_exec(unsigned long size)
 {
 	return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC);


Although these patches do nothing but move code above a comment block, they make me worry/grumble, because the author clearly preferred the original code layout.

I'm -not- going to NAK this changeset, since it's not my code, but just pointing this out. It would be nice if kernel-doc could grok this sort of stuff, but I understand why it can't (without parsing c/cpp).

ACK for the other changesets in your series.

	Jeff


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux