Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916...

[deliverable/linux.git] / include / linux / tty.h

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 6abfcf5b5887c030bfea8b4162a006d3f21a2502..568369a86306e5e80b5db3974db85dce56360f80 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -68,6 +68,16 @@ struct tty_buffer {
        unsigned long data[0];
 };
 
+/*
+ * We default to dicing tty buffer allocations to this many characters
+ * in order to avoid multiple page allocations. We assume tty_buffer itself
+ * is under 256 bytes. See tty_buffer_find for the allocation logic this
+ * must match
+ */
+
+#define TTY_BUFFER_PAGE                ((PAGE_SIZE  - 256) / 2)
+
+
 struct tty_bufhead {
        struct delayed_work work;
        spinlock_t lock;
@@ -504,6 +514,7 @@ extern void tty_ldisc_enable(struct tty_struct *tty);
 
 /* n_tty.c */
 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
+extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops);
 
 /* tty_audit.c */
 #ifdef CONFIG_AUDIT