summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-06-15 15:36:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-24 01:47:10 +0200
commit9114fe8ccf1871f630d2c14cd60e5f455b015459 (patch)
tree1549929e9dfe5faf7a43897f5901a6d005cb6bec
parenttty: Fix unsafe vt paste_selection() (diff)
downloadlinux-9114fe8ccf1871f630d2c14cd60e5f455b015459.tar.xz
linux-9114fe8ccf1871f630d2c14cd60e5f455b015459.zip
tty: Remove private constant from global namespace
TTY_BUFFER_PAGE is only used within drivers/tty/tty_buffer.c; relocate to that file scope. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/tty_buffer.c10
-rw-r--r--include/linux/tty.h11
2 files changed, 10 insertions, 11 deletions
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index f22e116db105..c043136fbe51 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -28,6 +28,16 @@
*/
#define TTYB_MEM_LIMIT 65536
+/*
+ * We default to dicing tty buffer allocations to this many characters
+ * in order to avoid multiple page allocations. We know the size of
+ * tty_buffer itself but it must also be taken into account that the
+ * the buffer is 256 byte aligned. See tty_buffer_find for the allocation
+ * logic this must match
+ */
+
+#define TTY_BUFFER_PAGE (((PAGE_SIZE - sizeof(struct tty_buffer)) / 2) & ~0xFF)
+
/**
* tty_buffer_lock_exclusive - gain exclusive access to buffer
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 7a9a3b0a6b5a..5fd5d6f1ebc4 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -53,17 +53,6 @@ static inline char *flag_buf_ptr(struct tty_buffer *b, int ofs)
return (char *)char_buf_ptr(b, ofs) + b->size;
}
-/*
- * We default to dicing tty buffer allocations to this many characters
- * in order to avoid multiple page allocations. We know the size of
- * tty_buffer itself but it must also be taken into account that the
- * the buffer is 256 byte aligned. See tty_buffer_find for the allocation
- * logic this must match
- */
-
-#define TTY_BUFFER_PAGE (((PAGE_SIZE - sizeof(struct tty_buffer)) / 2) & ~0xFF)
-
-
struct tty_bufhead {
struct tty_buffer *head; /* Queue head */
struct work_struct work;