public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org,
	stable-review@kernel.org, torvalds@linux-foundation.org,
	akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk
Cc: "Justin P. Mattock" <justinmattock@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>, Gilles Espinasse <g.esp@free.fr>
Subject: [patch 32/30] kbuild: fix C libary confusion in unifdef.c due to getline()
Date: Wed, 1 Jul 2009 11:38:12 -0700	[thread overview]
Message-ID: <20090701183812.GC14064@kroah.com> (raw)
In-Reply-To: <20090701183548.GA14064@kroah.com>

2.6.27-stable review patch

-------------------------

From: Justin P. Mattock <justinmattock@gmail.com>

commit d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 upstream.

This fixes an error when compiling the kernel.

  CHK     include/linux/version.h
  HOSTCC  scripts/unifdef
scripts/unifdef.c:209: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
make[1]: *** [scripts/unifdef] Error 1
make: *** [__headers] Error 2

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Cc:  Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Gilles Espinasse <g.esp@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 scripts/unifdef.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         get_line(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void)
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = get_line();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+get_line(void)
 {
 	const char *cp;
 	int cursym;

      parent reply	other threads:[~2009-07-01 18:38 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20090630235944.868879272@mini.kroah.org>
2009-07-01  0:28 ` [patch 00/30] 2.6.27-stable review Greg KH
2009-06-30 23:59   ` [patch 01/30] parport: netmos 9845 & 9855 1P4S fixes Greg KH
2009-06-30 23:59   ` [patch 02/30] atmel_lcdfb: correct fifo size for some products Greg KH
2009-06-30 23:59   ` [patch 03/30] bonding: fix multiple module load problem Greg KH
2009-06-30 23:59   ` [patch 04/30] char: moxa, prevent opening unavailable ports Greg KH
2009-06-30 23:59   ` [patch 05/30] char: mxser, fix ISA board lookup Greg KH
2009-06-30 23:59   ` [patch 06/30] firmware_map: fix hang with x86/32bit Greg KH
2009-06-30 23:59   ` [patch 07/30] jbd: fix race in buffer processing in commit code Greg KH
2009-06-30 23:59   ` [patch 08/30] PCI: disable ASPM on VIA root-port-under-bridge configurations Greg KH
2009-06-30 23:59   ` [patch 09/30] r8169: fix crash when large packets are received Greg KH
2009-06-30 23:59   ` [patch 10/30] ISDN: Fix DMA alloc for hfcpci Greg KH
2009-06-30 23:59   ` [patch 11/30] x86: Add quirk for reboot stalls on a Dell Optiplex 360 Greg KH
2009-06-30 23:59   ` [patch 12/30] x86: quirk for reboot stalls on a Dell Optiplex 330 Greg KH
2009-06-30 23:59   ` [patch 13/30] ALSA: ca0106 - Add missing registrations of vmaster controls Greg KH
2009-06-30 23:59   ` [patch 14/30] floppy: provide a PNP device table in the module Greg KH
2009-06-30 23:59   ` [patch 15/30] floppy: request and release only the ports we actually use Greg KH
2009-07-01  0:00   ` [patch 16/30] IB/mlx4: Add strong ordering to local inval and fast reg work requests Greg KH
2009-07-01  0:00   ` [patch 17/30] x86: handle initrd that extends into unusable memory Greg KH
2009-07-01  0:00   ` [patch 18/30] lockdep: Select frame pointers on x86 Greg KH
2009-07-01  0:00   ` [patch 19/30] md/raid5: add missing call to schedule() after prepare_to_wait() Greg KH
2009-07-01  0:00   ` [patch 20/30] tcp: advertise MSS requested by user Greg KH
2009-07-01  0:00   ` [patch 21/30] parport_pc: after superio probing restore original register values Greg KH
2009-07-01  0:00   ` [patch 22/30] parport_pc: set properly the dma_mask for parport_pc device Greg KH
2009-07-01  0:00   ` [patch 23/30] PCI PM: Fix handling of devices without PM support by pci_target_state() Greg KH
2009-07-01  0:00   ` [patch 24/30] PCI PM: Follow PCI_PM_CTRL_NO_SOFT_RESET during transitions from D3 Greg KH
2009-07-01  0:00   ` [patch 25/30] pcmcia/cm4000: fix lock imbalance Greg KH
2009-07-01  0:00   ` [patch 26/30] sound: seq_midi_event: fix decoding of (N)RPN events Greg KH
2009-07-01  0:00   ` [patch 27/30] mm: fix handling of pagesets for downed cpus Greg KH
2009-07-01  0:00   ` [patch 28/30] dm mpath: validate hw_handler argument count Greg KH
2009-07-01  0:00   ` [patch 29/30] dm mpath: validate table " Greg KH
2009-07-01  0:00   ` [patch 30/30] dm: sysfs skip output when device is being destroyed Greg KH
2009-07-01  6:04   ` [patch 00/30] 2.6.27-stable review Christoph Biedl
2009-07-01 18:49     ` [stable] " Greg KH
2009-07-17 19:43     ` Greg KH
2009-07-01 18:35   ` Greg KH
2009-07-01 18:36     ` [patch 31/30] bsdacct: fix access to invalid filp in acct_on() Greg KH
2009-07-01 18:38     ` Greg KH [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090701183812.GC14064@kroah.com \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=fweisbec@gmail.com \
    --cc=g.esp@free.fr \
    --cc=justinmattock@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --cc=stable-review@kernel.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox