From 1db469044cef9679b23336d4074fa42b3c14f370 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Tue, 20 Dec 2005 14:53:05 -0800
Subject: [PATCH] --- yaml --- r: 15272 b: refs/heads/master c:
 a9c9dff1bc64750c81ee99779164d304c35d2ff3 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/Makefile      | 5 -----
 trunk/fs/relayfs/relay.c         | 8 ++------
 trunk/include/linux/relayfs_fs.h | 5 ++---
 trunk/init/Kconfig               | 1 -
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 6903d0dff065..ad9997b3989a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd30fc3256824f03c2ff9317269d66f72f7042ca
+refs/heads/master: a9c9dff1bc64750c81ee99779164d304c35d2ff3
diff --git a/trunk/arch/sparc64/Makefile b/trunk/arch/sparc64/Makefile
index 43fe382da078..cad10c5b83d3 100644
--- a/trunk/arch/sparc64/Makefile
+++ b/trunk/arch/sparc64/Makefile
@@ -17,7 +17,6 @@ CC		:= $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then
 NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow)
 NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi)
 UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; )
-INLINE_LIMIT := $(call cc-option-yn, -m64 -finline-limit=100000)
 
 export NEW_GCC
 
@@ -49,10 +48,6 @@ else
   AFLAGS += -m64 -mcpu=ultrasparc $(CC_UNDECL)
 endif
 
-ifeq ($(INLINE_LIMIT),y)
-  CFLAGS := $(CFLAGS) -finline-limit=100000
-endif
-
 ifeq ($(CONFIG_MCOUNT),y)
   CFLAGS := $(CFLAGS) -pg
 endif
diff --git a/trunk/fs/relayfs/relay.c b/trunk/fs/relayfs/relay.c
index 2a6f7f12b7f9..16446a15c96d 100644
--- a/trunk/fs/relayfs/relay.c
+++ b/trunk/fs/relayfs/relay.c
@@ -333,7 +333,8 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
 	return length;
 
 toobig:
-	buf->chan->last_toobig = length;
+	printk(KERN_WARNING "relayfs: event too large (%Zd)\n", length);
+	WARN_ON(1);
 	return 0;
 }
 
@@ -398,11 +399,6 @@ void relay_close(struct rchan *chan)
 		relay_close_buf(chan->buf[i]);
 	}
 
-	if (chan->last_toobig)
-		printk(KERN_WARNING "relayfs: one or more items not logged "
-		       "[item size (%Zd) > sub-buffer size (%Zd)]\n",
-		       chan->last_toobig, chan->subbuf_size);
-
 	kref_put(&chan->kref, relay_destroy_channel);
 }
 
diff --git a/trunk/include/linux/relayfs_fs.h b/trunk/include/linux/relayfs_fs.h
index fb7e80737325..cfafc3e76bc2 100644
--- a/trunk/include/linux/relayfs_fs.h
+++ b/trunk/include/linux/relayfs_fs.h
@@ -20,9 +20,9 @@
 #include <linux/kref.h>
 
 /*
- * Tracks changes to rchan/rchan_buf structs
+ * Tracks changes to rchan_buf struct
  */
-#define RELAYFS_CHANNEL_VERSION		6
+#define RELAYFS_CHANNEL_VERSION		5
 
 /*
  * Per-cpu relay channel buffer
@@ -60,7 +60,6 @@ struct rchan
 	struct rchan_callbacks *cb;	/* client callbacks */
 	struct kref kref;		/* channel refcount */
 	void *private_data;		/* for user-defined data */
-	size_t last_toobig;		/* tried to log event > subbuf size */
 	struct rchan_buf *buf[NR_CPUS]; /* per-cpu channel buffers */
 };
 
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 6c5dbedc6e96..9fc0759fa942 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -260,7 +260,6 @@ config CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size (Look out for broken compilers!)"
 	default y
 	depends on ARM || H8300 || EXPERIMENTAL
-	depends on !SPARC64
 	help
 	  Enabling this option will pass "-Os" instead of "-O2" to gcc
 	  resulting in a smaller kernel.