2 files changed, 11 insertions, 28 deletions

diff --git a/include/asm-avr32/pgtable.h b/include/asm-avr32/pgtable.h
index f6cc2b0f75c3..c07bdd10b891 100644
--- a/include/asm-avr32/pgtable.h
+++ b/include/asm-avr32/pgtable.h
@@ -201,18 +201,10 @@ extern struct page *empty_zero_page;
  * The following only work if pte_present() is true.
  * Undefined behaviour if not..
  */
-static inline int pte_read(pte_t pte)
-{
-        return pte_val(pte) & _PAGE_USER;
-}
 static inline int pte_write(pte_t pte)
 {
         return pte_val(pte) & _PAGE_RW;
 }
-static inline int pte_exec(pte_t pte)
-{
-        return pte_val(pte) & _PAGE_EXECUTE;
-}
 static inline int pte_dirty(pte_t pte)
 {
         return pte_val(pte) & _PAGE_DIRTY;
@@ -231,21 +223,11 @@ static inline int pte_file(pte_t pte)
 }
 
 /* Mutator functions for PTE bits */
-static inline pte_t pte_rdprotect(pte_t pte)
-{
-        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_USER));
-        return pte;
-}
 static inline pte_t pte_wrprotect(pte_t pte)
 {
         set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_RW));
         return pte;
 }
-static inline pte_t pte_exprotect(pte_t pte)
-{
-        set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_EXECUTE));
-        return pte;
-}
 static inline pte_t pte_mkclean(pte_t pte)
 {
         set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_DIRTY));
@@ -256,21 +238,11 @@ static inline pte_t pte_mkold(pte_t pte)
         set_pte(&pte, __pte(pte_val(pte) & ~_PAGE_ACCESSED));
         return pte;
 }
-static inline pte_t pte_mkread(pte_t pte)
-{
-        set_pte(&pte, __pte(pte_val(pte) | _PAGE_USER));
-        return pte;
-}
 static inline pte_t pte_mkwrite(pte_t pte)
 {
         set_pte(&pte, __pte(pte_val(pte) | _PAGE_RW));
         return pte;
 }
-static inline pte_t pte_mkexec(pte_t pte)
-{
-        set_pte(&pte, __pte(pte_val(pte) | _PAGE_EXECUTE));
-        return pte;
-}
 static inline pte_t pte_mkdirty(pte_t pte)
 {
         set_pte(&pte, __pte(pte_val(pte) | _PAGE_DIRTY));
diff --git a/include/asm-avr32/termbits.h b/include/asm-avr32/termbits.h
index c215fafdae4d..db2daab31fdb 100644
--- a/include/asm-avr32/termbits.h
+++ b/include/asm-avr32/termbits.h
@@ -17,6 +17,17 @@ struct termios {
         cc_t c_cc[NCCS];                /* control characters */
 };
 
+struct termios2 {
+        tcflag_t c_iflag;               /* input mode flags */
+        tcflag_t c_oflag;               /* output mode flags */
+        tcflag_t c_cflag;               /* control mode flags */
+        tcflag_t c_lflag;               /* local mode flags */
+        cc_t c_line;                    /* line discipline */
+        cc_t c_cc[NCCS];                /* control characters */
+        speed_t c_ispeed;               /* input speed */
+        speed_t c_ospeed;               /* output speed */
+};
+
 struct ktermios {
         tcflag_t c_iflag;               /* input mode flags */
         tcflag_t c_oflag;               /* output mode flags */