80 files changed, 1364 insertions, 749 deletions
diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h
index 27d71e9d413b..21c0e16dce5f 100644
--- a/include/asm-arm/arch-pxa/pxafb.h
+++ b/include/asm-arm/arch-pxa/pxafb.h
@@ -66,3 +66,4 @@ struct pxafb_mach_info {
 };
 void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info);
+unsigned long pxafb_get_hsync_time(struct device *dev);
diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h
new file mode 100644
index 000000000000..ac57bc887d82
--- /dev/null
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -0,0 +1,69 @@
+/* linux/include/asm/arch-s3c2410/fb.h
+ *
+ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
+ *
+ * Inspired by pxafb.h
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ *
+ *  Changelog:
+ *      07-Sep-2004     RTP     Created file
+ *      03-Nov-2004     BJD     Updated and minor cleanups
+ *      03-Aug-2005     RTP     Renamed to fb.h
+*/
+#ifndef __ASM_ARM_FB_H
+#define __ASM_ARM_FB_H
+#include <asm/arch/regs-lcd.h>
+struct s3c2410fb_val {
+        unsigned int    defval;
+        unsigned int    min;
+        unsigned int    max;
+};
+struct s3c2410fb_hw {
+        unsigned long   lcdcon1;
+        unsigned long   lcdcon2;
+        unsigned long   lcdcon3;
+        unsigned long   lcdcon4;
+        unsigned long   lcdcon5;
+};
+struct s3c2410fb_mach_info {
+        unsigned char   fixed_syncs;    /* do not update sync/border */
+        /* Screen size */
+        int             width;
+        int             height;
+        /* Screen info */
+        struct s3c2410fb_val xres;
+        struct s3c2410fb_val yres;
+        struct s3c2410fb_val bpp;
+        /* lcd configuration registers */
+        struct s3c2410fb_hw  regs;
+        /* GPIOs */
+        unsigned long   gpcup;
+        unsigned long   gpcup_mask;
+        unsigned long   gpccon;
+        unsigned long   gpccon_mask;
+        unsigned long   gpdup;
+        unsigned long   gpdup_mask;
+        unsigned long   gpdcon;
+        unsigned long   gpdcon_mask;
+        /* lpc3600 control register */
+        unsigned long   lpcsel;
+};
+void __init set_s3c2410fb_info(struct s3c2410fb_mach_info *hard_s3c2410fb_info);
+#endif /* __ASM_ARM_FB_H */
diff --git a/include/asm-arm/arch-s3c2410/regs-lcd.h b/include/asm-arm/arch-s3c2410/regs-lcd.h
index 7f882ea92b2a..b6b1b4e8bbeb 100644
--- a/include/asm-arm/arch-s3c2410/regs-lcd.h
+++ b/include/asm-arm/arch-s3c2410/regs-lcd.h
@@ -51,21 +51,32 @@
 #define S3C2410_LCDCON1_ENVID      (1)
+#define S3C2410_LCDCON1_MODEMASK    0x1E
 #define S3C2410_LCDCON2_VBPD(x)     ((x) << 24)
 #define S3C2410_LCDCON2_LINEVAL(x)  ((x) << 14)
 #define S3C2410_LCDCON2_VFPD(x)     ((x) << 6)
 #define S3C2410_LCDCON2_VSPW(x)     ((x) << 0)
+#define S3C2410_LCDCON2_GET_VBPD(x) ( ((x) >> 24) & 0xFF)
+#define S3C2410_LCDCON2_GET_VFPD(x) ( ((x) >>  6) & 0xFF)
+#define S3C2410_LCDCON2_GET_VSPW(x) ( ((x) >>  0) & 0x3F)
 #define S3C2410_LCDCON3_HBPD(x)     ((x) << 19)
 #define S3C2410_LCDCON3_WDLY(x)     ((x) << 19)
 #define S3C2410_LCDCON3_HOZVAL(x)   ((x) << 8)
 #define S3C2410_LCDCON3_HFPD(x)     ((x) << 0)
 #define S3C2410_LCDCON3_LINEBLANK(x)((x) << 0)
+#define S3C2410_LCDCON3_GET_HBPD(x) ( ((x) >> 19) & 0x7F)
+#define S3C2410_LCDCON3_GET_HFPD(x) ( ((x) >>  0) & 0xFF)
 #define S3C2410_LCDCON4_MVAL(x)     ((x) << 8)
 #define S3C2410_LCDCON4_HSPW(x)     ((x) << 0)
 #define S3C2410_LCDCON4_WLH(x)      ((x) << 0)
+#define S3C2410_LCDCON4_GET_HSPW(x) ( ((x) >>  0) & 0xFF)
 #define S3C2410_LCDCON5_BPP24BL     (1<<12)
 #define S3C2410_LCDCON5_FRM565      (1<<11)
 #define S3C2410_LCDCON5_INVVCLK     (1<<10)
@@ -100,10 +111,16 @@
 #define S3C2410_DITHMODE   S3C2410_LCDREG(0x4C)
 #define S3C2410_TPAL       S3C2410_LCDREG(0x50)
+#define S3C2410_TPAL_EN         (1<<24)
 /* interrupt info */
 #define S3C2410_LCDINTPND  S3C2410_LCDREG(0x54)
 #define S3C2410_LCDSRCPND  S3C2410_LCDREG(0x58)
 #define S3C2410_LCDINTMSK  S3C2410_LCDREG(0x5C)
+#define S3C2410_LCDINT_FIWSEL   (1<<2)
+#define S3C2410_LCDINT_FRSYNC   (1<<1)
+#define S3C2410_LCDINT_FICNT    (1<<0)
 #define S3C2410_LPCSEL     S3C2410_LCDREG(0x60)
 #define S3C2410_TFTPAL(x)  S3C2410_LCDREG((0x400 + (x)*4))
diff --git a/include/asm-i386/mach-default/mach_reboot.h b/include/asm-i386/mach-default/mach_reboot.h
index 521e227db679..06ae4d81ba6a 100644
--- a/include/asm-i386/mach-default/mach_reboot.h
+++ b/include/asm-i386/mach-default/mach_reboot.h
@@ -22,7 +22,15 @@ static inline void mach_reboot(void)
        for (i = 0; i < 100; i++) {
                kb_wait();
                udelay(50);
-                outb(0xfe, 0x64);         /* pulse reset low */
+                outb(0x60, 0x64);       /* write Controller Command Byte */
+                udelay(50);
+                kb_wait();
+                udelay(50);
+                outb(0x14, 0x60);       /* set "System flag" */
+                udelay(50);
+                kb_wait();
+                udelay(50);
+                outb(0xfe, 0x64);       /* pulse reset low */
                udelay(50);
        }
 }
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 516421300ea2..348fe3a4879d 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -29,7 +29,7 @@ static inline void get_memcfg_numa(void)
 #ifdef CONFIG_X86_NUMAQ
        if (get_memcfg_numaq())
                return;
-#elif CONFIG_ACPI_SRAT
+#elif defined(CONFIG_ACPI_SRAT)
        if (get_memcfg_from_srat())
                return;
 #endif
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h
index 33256db4a7cf..635235fa1e32 100644
--- a/include/asm-ia64/system.h
+++ b/include/asm-ia64/system.h
@@ -275,6 +275,7 @@ extern void ia64_load_extra (struct task_struct *task);
 */
 #define __ARCH_WANT_UNLOCKED_CTXSW
+#define ARCH_HAS_PREFETCH_SWITCH_STACK
 #define ia64_platform_is(x) (strcmp(x, platform_name) == 0)
 void cpu_idle_wait(void);
diff --git a/include/asm-mips/irq.h b/include/asm-mips/irq.h
index b90b11d0b886..3f2470e9e678 100644
--- a/include/asm-mips/irq.h
+++ b/include/asm-mips/irq.h
@@ -49,7 +49,4 @@ do {									\
 extern void arch_init_irq(void);
-struct irqaction;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
 #endif /* _ASM_IRQ_H */
diff --git a/include/asm-mips/vr41xx/tb0287.h b/include/asm-mips/vr41xx/tb0287.h
new file mode 100644
index 000000000000..dd9832313afe
--- /dev/null
+++ b/include/asm-mips/vr41xx/tb0287.h
@@ -0,0 +1,43 @@
+/*
+ *  tb0287.h, Include file for TANBAC TB0287 mini-ITX board.
+ *
+ *  Copyright (C) 2005  Media Lab Inc. <ito@mlb.co.jp>
+ *
+ *  This code is largely based on tb0219.h.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef __TANBAC_TB0287_H
+#define __TANBAC_TB0287_H
+#include <asm/vr41xx/vr41xx.h>
+/*
+ * General-Purpose I/O Pin Number
+ */
+#define TB0287_PCI_SLOT_PIN             2
+#define TB0287_SM501_PIN                3
+#define TB0287_SIL680A_PIN              8
+#define TB0287_RTL8110_PIN              13
+/*
+ * Interrupt Number
+ */
+#define TB0287_PCI_SLOT_IRQ             GIU_IRQ(TB0287_PCI_SLOT_PIN)
+#define TB0287_SM501_IRQ                GIU_IRQ(TB0287_SM501_PIN)
+#define TB0287_SIL680A_IRQ              GIU_IRQ(TB0287_SIL680A_PIN)
+#define TB0287_RTL8110_IRQ              GIU_IRQ(TB0287_RTL8110_PIN)
+#endif /* __TANBAC_TB0287_H */
diff --git a/include/asm-powerpc/8253pit.h b/include/asm-powerpc/8253pit.h
index 862708a749b0..b70d6e53b303 100644
--- a/include/asm-powerpc/8253pit.h
+++ b/include/asm-powerpc/8253pit.h
@@ -1,10 +1,10 @@
+#ifndef _ASM_POWERPC_8253PIT_H
+#define _ASM_POWERPC_8253PIT_H
 /*
 * 8253/8254 Programmable Interval Timer
 */
-#ifndef _8253PIT_H
-#define _8253PIT_H
 #define PIT_TICK_RATE   1193182UL
-#endif
+#endif  /* _ASM_POWERPC_8253PIT_H */
diff --git a/include/asm-powerpc/agp.h b/include/asm-powerpc/agp.h
index ca9e423307f4..885b4631a6cf 100644
--- a/include/asm-powerpc/agp.h
+++ b/include/asm-powerpc/agp.h
@@ -1,10 +1,8 @@
-#ifndef AGP_H
+#ifndef _ASM_POWERPC_AGP_H
-#define AGP_H 1
+#define _ASM_POWERPC_AGP_H
 #include <asm/io.h>
-/* nothing much needed here */
 #define map_page_into_agp(page)
 #define unmap_page_from_agp(page)
 #define flush_agp_mappings()
@@ -20,4 +18,4 @@
 #define free_gatt_pages(table, order)   \
        free_pages((unsigned long)(table), (order))
-#endif
+#endif  /* _ASM_POWERPC_AGP_H */
diff --git a/include/asm-powerpc/bugs.h b/include/asm-powerpc/bugs.h
index 310187d0e33a..42fdb73e3068 100644
--- a/include/asm-powerpc/bugs.h
+++ b/include/asm-powerpc/bugs.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_BUGS_H
+#ifndef _ASM_POWERPC_BUGS_H
-#define _POWERPC_BUGS_H
+#define _ASM_POWERPC_BUGS_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -13,6 +13,6 @@
 * architecture-dependent bugs.
 */
-extern void check_bugs(void);
+static inline void check_bugs(void) { }
-#endif /* _POWERPC_BUGS_H */
+#endif  /* _ASM_POWERPC_BUGS_H */
diff --git a/include/asm-powerpc/errno.h b/include/asm-powerpc/errno.h
index 19f20bd41ae6..8c145fd17d86 100644
--- a/include/asm-powerpc/errno.h
+++ b/include/asm-powerpc/errno.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_ERRNO_H
+#ifndef _ASM_POWERPC_ERRNO_H
-#define _PPC_ERRNO_H
+#define _ASM_POWERPC_ERRNO_H
 #include <asm-generic/errno.h>
@@ -8,4 +8,4 @@
 #define _LAST_ERRNO     516
-#endif
+#endif  /* _ASM_POWERPC_ERRNO_H */
diff --git a/include/asm-powerpc/ioctl.h b/include/asm-powerpc/ioctl.h
index 93c6acfdd0fd..8eb99848c402 100644
--- a/include/asm-powerpc/ioctl.h
+++ b/include/asm-powerpc/ioctl.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_IOCTL_H
+#ifndef _ASM_POWERPC_IOCTL_H
-#define _PPC_IOCTL_H
+#define _ASM_POWERPC_IOCTL_H
 /*
@@ -66,4 +66,4 @@ extern unsigned int __invalid_size_argument_for_IOC;
 #define IOCSIZE_MASK    (_IOC_SIZEMASK << _IOC_SIZESHIFT)
 #define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
-#endif
+#endif  /* _ASM_POWERPC_IOCTL_H */
diff --git a/include/asm-powerpc/ioctls.h b/include/asm-powerpc/ioctls.h
index f5b7f2b055e7..5b94ff489b8b 100644
--- a/include/asm-powerpc/ioctls.h
+++ b/include/asm-powerpc/ioctls.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_PPC_IOCTLS_H
+#ifndef _ASM_POWERPC_IOCTLS_H
-#define _ASM_PPC_IOCTLS_H
+#define _ASM_POWERPC_IOCTLS_H
 #include <asm/ioctl.h>
@@ -104,4 +104,4 @@
 #define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
 #define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#endif /* _ASM_PPC_IOCTLS_H */
+#endif  /* _ASM_POWERPC_IOCTLS_H */
diff --git a/include/asm-powerpc/linkage.h b/include/asm-powerpc/linkage.h
index 291c2d01c44f..e1c4ac1cc4ba 100644
--- a/include/asm-powerpc/linkage.h
+++ b/include/asm-powerpc/linkage.h
@@ -1,6 +1,6 @@
-#ifndef __ASM_LINKAGE_H
+#ifndef _ASM_POWERPC_LINKAGE_H
-#define __ASM_LINKAGE_H
+#define _ASM_POWERPC_LINKAGE_H
 /* Nothing to see here... */
-#endif
+#endif  /* _ASM_POWERPC_LINKAGE_H */
diff --git a/include/asm-powerpc/mc146818rtc.h b/include/asm-powerpc/mc146818rtc.h
index a5619a2a1393..f2741c8b59a1 100644
--- a/include/asm-powerpc/mc146818rtc.h
+++ b/include/asm-powerpc/mc146818rtc.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_MC146818RTC_H
+#ifndef _ASM_POWERPC_MC146818RTC_H
-#define _POWERPC_MC146818RTC_H
+#define _ASM_POWERPC_MC146818RTC_H
 /*
 * Machine dependent access functions for RTC registers.
@@ -33,4 +33,4 @@ outb_p((val),RTC_PORT(1)); \
 })
 #endif  /* __KERNEL__ */
-#endif  /* _POWERPC_MC146818RTC_H */
+#endif  /* _ASM_POWERPC_MC146818RTC_H */
diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h
index f2d55988d749..f5e5342fcac5 100644
--- a/include/asm-powerpc/mman.h
+++ b/include/asm-powerpc/mman.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_MMAN_H
+#ifndef _ASM_POWERPC_MMAN_H
-#define _POWERPC_MMAN_H
+#define _ASM_POWERPC_MMAN_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -49,4 +49,4 @@
 #define MAP_ANON        MAP_ANONYMOUS
 #define MAP_FILE        0
-#endif /* _POWERPC_MMAN_H */
+#endif  /* _ASM_POWERPC_MMAN_H */
diff --git a/include/asm-powerpc/module.h b/include/asm-powerpc/module.h
index 4438f4fd6524..7ecd05e03051 100644
--- a/include/asm-powerpc/module.h
+++ b/include/asm-powerpc/module.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_MODULE_H
+#ifndef _ASM_POWERPC_MODULE_H
-#define _POWERPC_MODULE_H
+#define _ASM_POWERPC_MODULE_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -74,4 +74,4 @@ struct exception_table_entry;
 void sort_ex_table(struct exception_table_entry *start,
                   struct exception_table_entry *finish);
-#endif /* _POWERPC_MODULE_H */
+#endif  /* _ASM_POWERPC_MODULE_H */
diff --git a/include/asm-ppc/msgbuf.h b/include/asm-powerpc/msgbuf.h
index 1053452a9376..dd76743c7537 100644
--- a/include/asm-ppc/msgbuf.h
+++ b/include/asm-powerpc/msgbuf.h
@@ -1,17 +1,25 @@
-#ifndef _PPC_MSGBUF_H
+#ifndef _ASM_POWERPC_MSGBUF_H
-#define _PPC_MSGBUF_H
+#define _ASM_POWERPC_MSGBUF_H
 /*
- * The msqid64_ds structure for the PPC architecture.
+ * The msqid64_ds structure for the PowerPC architecture.
+ * Note extra padding because this structure is passed back and forth
+ * between kernel and user space.
 */
 struct msqid64_ds {
        struct ipc64_perm msg_perm;
+#ifndef __powerpc64__
        unsigned int    __unused1;
+#endif
        __kernel_time_t msg_stime;      /* last msgsnd time */
+#ifndef __powerpc64__
        unsigned int    __unused2;
+#endif
        __kernel_time_t msg_rtime;      /* last msgrcv time */
+#ifndef __powerpc64__
        unsigned int    __unused3;
+#endif
        __kernel_time_t msg_ctime;      /* last change time */
        unsigned long  msg_cbytes;      /* current number of bytes on queue */
        unsigned long  msg_qnum;        /* number of messages in queue */
@@ -22,4 +30,4 @@ struct msqid64_ds {
        unsigned long  __unused5;
 };
-#endif /* _PPC_MSGBUF_H */
+#endif  /* _ASM_POWERPC_MSGBUF_H */
diff --git a/include/asm-powerpc/namei.h b/include/asm-powerpc/namei.h
index 29c9ec832133..657443474a6a 100644
--- a/include/asm-powerpc/namei.h
+++ b/include/asm-powerpc/namei.h
@@ -1,14 +1,14 @@
+#ifndef _ASM_POWERPC_NAMEI_H
+#define _ASM_POWERPC_NAMEI_H
+#ifdef __KERNEL__
 /*
- * include/asm-ppc/namei.h
 * Adapted from include/asm-alpha/namei.h
 *
 * Included from fs/namei.c
 */
-#ifdef __KERNEL__
-#ifndef __PPC_NAMEI_H
-#define __PPC_NAMEI_H
 /* This dummy routine maybe changed to something useful
 * for /usr/gnemul/ emulation stuff.
 * Look at asm-sparc/namei.h for details.
@@ -16,5 +16,5 @@
 #define __emul_prefix() NULL
-#endif /* __PPC_NAMEI_H */
+#endif  /* __KERNEL__ */
-#endif /* __KERNEL__ */
+#endif  /* _ASM_POWERPC_NAMEI_H */
diff --git a/include/asm-ppc/param.h b/include/asm-powerpc/param.h
index 6198b1657a45..bdc724f70884 100644
--- a/include/asm-ppc/param.h
+++ b/include/asm-powerpc/param.h
@@ -1,10 +1,10 @@
-#ifndef _ASM_PPC_PARAM_H
+#ifndef _ASM_POWERPC_PARAM_H
-#define _ASM_PPC_PARAM_H
+#define _ASM_POWERPC_PARAM_H
 #include <linux/config.h>
 #ifdef __KERNEL__
-#define HZ              CONFIG_HZ       /* internal timer frequency */
+#define HZ              CONFIG_HZ       /* internal kernel timer frequency */
 #define USER_HZ         100             /* for user interfaces in "ticks" */
 #define CLOCKS_PER_SEC  (USER_HZ)       /* frequency at which times() counts */
 #endif /* __KERNEL__ */
@@ -21,4 +21,4 @@
 #define MAXHOSTNAMELEN  64      /* max length of hostname */
-#endif
+#endif  /* _ASM_POWERPC_PARAM_H */
diff --git a/include/asm-powerpc/poll.h b/include/asm-powerpc/poll.h
index be5024913c62..edd2054da86b 100644
--- a/include/asm-powerpc/poll.h
+++ b/include/asm-powerpc/poll.h
@@ -1,5 +1,5 @@
-#ifndef __PPC_POLL_H
+#ifndef _ASM_POWERPC_POLL_H
-#define __PPC_POLL_H
+#define _ASM_POWERPC_POLL_H
 #define POLLIN          0x0001
 #define POLLPRI         0x0002
@@ -20,4 +20,4 @@ struct pollfd {
        short revents;
 };
-#endif
+#endif  /* _ASM_POWERPC_POLL_H */
diff --git a/include/asm-powerpc/sembuf.h b/include/asm-powerpc/sembuf.h
index c98fc18fe805..99a41938ae3d 100644
--- a/include/asm-powerpc/sembuf.h
+++ b/include/asm-powerpc/sembuf.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SEMBUF_H
+#ifndef _ASM_POWERPC_SEMBUF_H
-#define _POWERPC_SEMBUF_H
+#define _ASM_POWERPC_SEMBUF_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -33,4 +33,4 @@ struct semid64_ds {
        unsigned long   __unused4;
 };
-#endif /* _POWERPC_SEMBUF_H */
+#endif  /* _ASM_POWERPC_SEMBUF_H */
diff --git a/include/asm-powerpc/setup.h b/include/asm-powerpc/setup.h
new file mode 100644
index 000000000000..3d9740aae018
--- /dev/null
+++ b/include/asm-powerpc/setup.h
@@ -0,0 +1,9 @@
+#ifndef _ASM_POWERPC_SETUP_H
+#define _ASM_POWERPC_SETUP_H
+#ifdef __KERNEL__
+#define COMMAND_LINE_SIZE       512
+#endif  /* __KERNEL__ */
+#endif  /* _ASM_POWERPC_SETUP_H */
diff --git a/include/asm-powerpc/shmbuf.h b/include/asm-powerpc/shmbuf.h
index 29632db3b178..8efa39698b6c 100644
--- a/include/asm-powerpc/shmbuf.h
+++ b/include/asm-powerpc/shmbuf.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SHMBUF_H
+#ifndef _ASM_POWERPC_SHMBUF_H
-#define _POWERPC_SHMBUF_H
+#define _ASM_POWERPC_SHMBUF_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -21,19 +21,19 @@
 struct shmid64_ds {
        struct ipc64_perm       shm_perm;       /* operation perms */
-#ifndef __power64__
+#ifndef __powerpc64__
        unsigned long           __unused1;
 #endif
        __kernel_time_t         shm_atime;      /* last attach time */
-#ifndef __power64__
+#ifndef __powerpc64__
        unsigned long           __unused2;
 #endif
        __kernel_time_t         shm_dtime;      /* last detach time */
-#ifndef __power64__
+#ifndef __powerpc64__
        unsigned long           __unused3;
 #endif
        __kernel_time_t         shm_ctime;      /* last change time */
-#ifndef __power64__
+#ifndef __powerpc64__
        unsigned long           __unused4;
 #endif
        size_t                  shm_segsz;      /* size of segment (bytes) */
@@ -56,4 +56,4 @@ struct shminfo64 {
        unsigned long   __unused4;
 };
-#endif /* _POWERPC_SHMBUF_H */
+#endif  /* _ASM_POWERPC_SHMBUF_H */
diff --git a/include/asm-powerpc/shmparam.h b/include/asm-powerpc/shmparam.h
index d6250602ae64..5cda42a6d39e 100644
--- a/include/asm-powerpc/shmparam.h
+++ b/include/asm-powerpc/shmparam.h
@@ -1,6 +1,6 @@
-#ifndef _PPC_SHMPARAM_H
+#ifndef _ASM_POWERPC_SHMPARAM_H
-#define _PPC_SHMPARAM_H
+#define _ASM_POWERPC_SHMPARAM_H
 #define SHMLBA PAGE_SIZE                 /* attach addr a multiple of this */
-#endif /* _PPC_SHMPARAM_H */
+#endif  /* _ASM_POWERPC_SHMPARAM_H */
diff --git a/include/asm-powerpc/siginfo.h b/include/asm-powerpc/siginfo.h
index ae70b8010b19..538ea8ef509b 100644
--- a/include/asm-powerpc/siginfo.h
+++ b/include/asm-powerpc/siginfo.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SIGINFO_H
+#ifndef _ASM_POWERPC_SIGINFO_H
-#define _POWERPC_SIGINFO_H
+#define _ASM_POWERPC_SIGINFO_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -15,4 +15,4 @@
 #include <asm-generic/siginfo.h>
-#endif /* _POWERPC_SIGINFO_H */
+#endif  /* _ASM_POWERPC_SIGINFO_H */
diff --git a/include/asm-powerpc/socket.h b/include/asm-powerpc/socket.h
index 51a0cf5ee9f0..e4b8177d4acc 100644
--- a/include/asm-powerpc/socket.h
+++ b/include/asm-powerpc/socket.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SOCKET_H
+#ifndef _ASM_POWERPC_SOCKET_H
-#define _POWERPC_SOCKET_H
+#define _ASM_POWERPC_SOCKET_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -56,4 +56,4 @@
 #define SO_PEERSEC              31
-#endif /* _POWERPC_SOCKET_H */
+#endif  /* _ASM_POWERPC_SOCKET_H */
diff --git a/include/asm-powerpc/sockios.h b/include/asm-powerpc/sockios.h
index ef7ff664167e..590078d8ed28 100644
--- a/include/asm-powerpc/sockios.h
+++ b/include/asm-powerpc/sockios.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_SOCKIOS_H
+#ifndef _ASM_POWERPC_SOCKIOS_H
-#define _POWERPC_SOCKIOS_H
+#define _ASM_POWERPC_SOCKIOS_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -16,4 +16,4 @@
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906          /* Get stamp */
-#endif /* _POWERPC_SOCKIOS_H */
+#endif  /* _ASM_POWERPC_SOCKIOS_H */
diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h
index 225575997392..8606a696c088 100644
--- a/include/asm-powerpc/string.h
+++ b/include/asm-powerpc/string.h
@@ -1,5 +1,5 @@
-#ifndef _PPC_STRING_H_
+#ifndef _ASM_POWERPC_STRING_H
-#define _PPC_STRING_H_
+#define _ASM_POWERPC_STRING_H
 #ifdef __KERNEL__
@@ -29,4 +29,4 @@ extern void * memchr(const void *,int,__kernel_size_t);
 #endif /* __KERNEL__ */
-#endif
+#endif  /* _ASM_POWERPC_STRING_H */
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h
index 2c5bf85a8c3c..ebf6055481dc 100644
--- a/include/asm-powerpc/termbits.h
+++ b/include/asm-powerpc/termbits.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_TERMBITS_H
+#ifndef _ASM_POWERPC_TERMBITS_H
-#define _POWERPC_TERMBITS_H
+#define _ASM_POWERPC_TERMBITS_H
 /*
 * This program is free software; you can redistribute it and/or
@@ -188,4 +188,4 @@ struct termios {
 #define TCSADRAIN       1
 #define TCSAFLUSH       2
-#endif /* _POWERPC_TERMBITS_H */
+#endif  /* _ASM_POWERPC_TERMBITS_H */
diff --git a/include/asm-powerpc/termios.h b/include/asm-powerpc/termios.h
index 237533bb0e9f..c5b8e5358f83 100644
--- a/include/asm-powerpc/termios.h
+++ b/include/asm-powerpc/termios.h
@@ -1,5 +1,5 @@
-#ifndef _POWERPC_TERMIOS_H
+#ifndef _ASM_POWERPC_TERMIOS_H
-#define _POWERPC_TERMIOS_H
+#define _ASM_POWERPC_TERMIOS_H
 /*
 * Liberally adapted from alpha/termios.h.  In particular, the c_cc[]
@@ -233,4 +233,4 @@ struct termio {
 #endif  /* __KERNEL__ */
-#endif  /* _POWERPC_TERMIOS_H */
+#endif  /* _ASM_POWERPC_TERMIOS_H */
diff --git a/include/asm-ppc/timex.h b/include/asm-powerpc/timex.h
index cffc8712077c..51c5b316be55 100644
--- a/include/asm-ppc/timex.h
+++ b/include/asm-powerpc/timex.h
@@ -1,11 +1,11 @@
+#ifndef _ASM_POWERPC_TIMEX_H
+#define _ASM_POWERPC_TIMEX_H
+#ifdef __KERNEL__
 /*
- * include/asm-ppc/timex.h
+ * PowerPC architecture timex specifications
- *
- * ppc architecture timex specifications
 */
-#ifdef __KERNEL__
-#ifndef _ASMppc_TIMEX_H
-#define _ASMppc_TIMEX_H
 #include <linux/config.h>
 #include <asm/cputable.h>
@@ -14,14 +14,21 @@
 typedef unsigned long cycles_t;
-/*
- * For the "cycle" counter we use the timebase lower half.
- * Currently only used on SMP.
- */
 static inline cycles_t get_cycles(void)
 {
-        cycles_t ret = 0;
+        cycles_t ret;
+#ifdef __powerpc64__
+        __asm__ __volatile__("mftb %0" : "=r" (ret) : );
+#else
+        /*
+         * For the "cycle" counter we use the timebase lower half.
+         * Currently only used on SMP.
+         */
+        ret = 0;
        __asm__ __volatile__(
                "98:    mftb %0\n"
@@ -33,8 +40,10 @@ static inline cycles_t get_cycles(void)
                "       .long 99b\n"
                ".previous"
                : "=r" (ret) : "i" (CPU_FTR_601));
+#endif
        return ret;
 }
-#endif
+#endif  /* __KERNEL__ */
-#endif /* __KERNEL__ */
+#endif  /* _ASM_POWERPC_TIMEX_H */
diff --git a/include/asm-ppc64/topology.h b/include/asm-powerpc/topology.h
index 1e9b19073230..2512e3836bf4 100644
--- a/include/asm-ppc64/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -1,11 +1,12 @@
-#ifndef _ASM_PPC64_TOPOLOGY_H
+#ifndef _ASM_POWERPC_TOPOLOGY_H
-#define _ASM_PPC64_TOPOLOGY_H
+#define _ASM_POWERPC_TOPOLOGY_H
 #include <linux/config.h>
-#include <asm/mmzone.h>
 #ifdef CONFIG_NUMA
+#include <asm/mmzone.h>
 static inline int cpu_to_node(int cpu)
 {
        int node;
@@ -66,4 +67,4 @@ static inline int node_to_first_cpu(int node)
 #endif /* CONFIG_NUMA */
-#endif /* _ASM_PPC64_TOPOLOGY_H */
+#endif  /* _ASM_POWERPC_TOPOLOGY_H */
diff --git a/include/asm-powerpc/unaligned.h b/include/asm-powerpc/unaligned.h
index 45520d9b85d1..6c95dfa2652f 100644
--- a/include/asm-powerpc/unaligned.h
+++ b/include/asm-powerpc/unaligned.h
@@ -1,6 +1,7 @@
+#ifndef _ASM_POWERPC_UNALIGNED_H
+#define _ASM_POWERPC_UNALIGNED_H
 #ifdef __KERNEL__
-#ifndef __PPC_UNALIGNED_H
-#define __PPC_UNALIGNED_H
 /*
 * The PowerPC can do unaligned accesses itself in big endian mode.
@@ -14,5 +15,5 @@
 #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-#endif
+#endif  /* __KERNEL__ */
-#endif /* __KERNEL__ */
+#endif  /* _ASM_POWERPC_UNALIGNED_H */
diff --git a/include/asm-ppc/user.h b/include/asm-powerpc/user.h
index d662b2151370..e59ade4b3dfb 100644
--- a/include/asm-ppc/user.h
+++ b/include/asm-powerpc/user.h
@@ -1,13 +1,14 @@
-#ifdef __KERNEL__
+#ifndef _ASM_POWERPC_USER_H
-#ifndef _PPC_USER_H
+#define _ASM_POWERPC_USER_H
-#define _PPC_USER_H
-/* Adapted from <asm-alpha/user.h> */
+#ifdef __KERNEL__
-#include <linux/ptrace.h>
+#include <asm/ptrace.h>
 #include <asm/page.h>
 /*
+ * Adapted from <asm-alpha/user.h>
+ *
 * Core file format: The core file is written in such a way that gdb
 * can understand it and provide useful information to the user (under
 * linux we use the `trad-core' bfd, NOT the osf-core).  The file contents
@@ -50,5 +51,5 @@ struct user {
 #define HOST_DATA_START_ADDR    (u.start_data)
 #define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
-#endif /* _PPC_USER_H */
+#endif  /* __KERNEL__ */
-#endif /* __KERNEL__ */
+#endif  /* _ASM_POWERPC_USER_H */
diff --git a/include/asm-ppc/irq.h b/include/asm-ppc/irq.h
index b4b270457edd..55752474d0d9 100644
--- a/include/asm-ppc/irq.h
+++ b/include/asm-ppc/irq.h
@@ -404,9 +404,5 @@ extern unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
 extern unsigned long ppc_lost_interrupts[NR_MASK_WORDS];
 extern atomic_t ppc_n_lost_interrupts;
-struct irqaction;
-struct pt_regs;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
 #endif /* _ASM_IRQ_H */
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/reg.h b/include/asm-ppc/reg.h
index 88b4222154d4..73c33e3ef9c6 100644
--- a/include/asm-ppc/reg.h
+++ b/include/asm-ppc/reg.h
@@ -366,12 +366,6 @@
 #define PVR_STB03XXX    0x40310000
 #define PVR_NP405H      0x41410000
 #define PVR_NP405L      0x41610000
-#define PVR_440GP_RB    0x40120440
-#define PVR_440GP_RC1   0x40120481
-#define PVR_440GP_RC2   0x40200481
-#define PVR_440GX_RA    0x51b21850
-#define PVR_440GX_RB    0x51b21851
-#define PVR_440GX_RC    0x51b21892
 #define PVR_601         0x00010000
 #define PVR_602         0x00050000
 #define PVR_603         0x00030000
diff --git a/include/asm-ppc/setup.h b/include/asm-ppc/setup.h
deleted file mode 100644
index d2d19ee103df..000000000000
--- a/include/asm-ppc/setup.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _PPC_SETUP_H
-#define _PPC_SETUP_H
-#define m68k_num_memory num_memory
-#define m68k_memory memory
-#include <asm-m68k/setup.h>
-/* We have a bigger command line buffer. */
-#undef COMMAND_LINE_SIZE
-#define COMMAND_LINE_SIZE       512
-#endif /* _PPC_SETUP_H */
-#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/topology.h b/include/asm-ppc/topology.h
deleted file mode 100644
index 6a029bbba6e1..000000000000
--- a/include/asm-ppc/topology.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_PPC_TOPOLOGY_H
-#define _ASM_PPC_TOPOLOGY_H
-#include <asm-generic/topology.h>
-#endif /* _ASM_PPC_TOPOLOGY_H */
diff --git a/include/asm-ppc64/eeh.h b/include/asm-ppc64/eeh.h
index 94298b106a4b..40c8eb57493e 100644
--- a/include/asm-ppc64/eeh.h
+++ b/include/asm-ppc64/eeh.h
@@ -219,23 +219,24 @@ static inline void eeh_raw_writeq(u64 val, volatile void __iomem *addr)
 static inline void eeh_memset_io(volatile void __iomem *addr, int c,
                                 unsigned long n)
 {
+        void *p = (void __force *)addr;
        u32 lc = c;
        lc |= lc << 8;
        lc |= lc << 16;
-        while(n && !EEH_CHECK_ALIGN(addr, 4)) {
+        while(n && !EEH_CHECK_ALIGN(p, 4)) {
-                *((volatile u8 *)addr) = c;
+                *((volatile u8 *)p) = c;
-                addr = (void *)((unsigned long)addr + 1);
+                p++;
                n--;
        }
        while(n >= 4) {
-                *((volatile u32 *)addr) = lc;
+                *((volatile u32 *)p) = lc;
-                addr = (void *)((unsigned long)addr + 4);
+                p += 4;
                n -= 4;
        }
        while(n) {
-                *((volatile u8 *)addr) = c;
+                *((volatile u8 *)p) = c;
-                addr = (void *)((unsigned long)addr + 1);
+                p++;
                n--;
        }
        __asm__ __volatile__ ("sync" : : : "memory");
@@ -250,22 +251,22 @@ static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *sr
        while(n && (!EEH_CHECK_ALIGN(vsrc, 4) || !EEH_CHECK_ALIGN(dest, 4))) {
                *((u8 *)dest) = *((volatile u8 *)vsrc);
                __asm__ __volatile__ ("eieio" : : : "memory");
-                vsrc = (void *)((unsigned long)vsrc + 1);
+                vsrc++;
-                dest = (void *)((unsigned long)dest + 1);                       
+                dest++;
                n--;
        }
        while(n > 4) {
                *((u32 *)dest) = *((volatile u32 *)vsrc);
                __asm__ __volatile__ ("eieio" : : : "memory");
-                vsrc = (void *)((unsigned long)vsrc + 4);
+                vsrc += 4;
-                dest = (void *)((unsigned long)dest + 4);                       
+                dest += 4;
                n -= 4;
        }
        while(n) {
                *((u8 *)dest) = *((volatile u8 *)vsrc);
                __asm__ __volatile__ ("eieio" : : : "memory");
-                vsrc = (void *)((unsigned long)vsrc + 1);
+                vsrc++;
-                dest = (void *)((unsigned long)dest + 1);                       
+                dest++;
                n--;
        }
        __asm__ __volatile__ ("sync" : : : "memory");
@@ -286,20 +287,20 @@ static inline void eeh_memcpy_toio(volatile void __iomem *dest, const void *src,
        while(n && (!EEH_CHECK_ALIGN(vdest, 4) || !EEH_CHECK_ALIGN(src, 4))) {
                *((volatile u8 *)vdest) = *((u8 *)src);
-                src = (void *)((unsigned long)src + 1);
+                src++;
-                vdest = (void *)((unsigned long)vdest + 1);                     
+                vdest++;
                n--;
        }
        while(n > 4) {
                *((volatile u32 *)vdest) = *((volatile u32 *)src);
-                src = (void *)((unsigned long)src + 4);
+                src += 4;
-                vdest = (void *)((unsigned long)vdest + 4);                     
+                vdest += 4;
                n-=4;
        }
        while(n) {
                *((volatile u8 *)vdest) = *((u8 *)src);
-                src = (void *)((unsigned long)src + 1);
+                src++;
-                vdest = (void *)((unsigned long)vdest + 1);                     
+                vdest++;
                n--;
        }
        __asm__ __volatile__ ("sync" : : : "memory");
diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h
index aba1dfa388ba..59c958aea4db 100644
--- a/include/asm-ppc64/io.h
+++ b/include/asm-ppc64/io.h
@@ -20,10 +20,10 @@
 #include <asm-generic/iomap.h>
-#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 *)(p), (a), (c))
+#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))
-#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 *)(p), (a), (c))
+#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))
-#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 *)(p), (a), (c))
+#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))
-#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 *)(p), (a), (c))
+#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))
 #define SIO_CONFIG_RA   0x398
@@ -71,8 +71,8 @@ extern unsigned long io_page_mask;
 * Neither do the standard versions now, these are just here
 * for older code.
 */
-#define insw_ns(port, buf, ns)  _insw_ns((u16 *)((port)+pci_io_base), (buf), (ns))
+#define insw_ns(port, buf, ns)  _insw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
-#define insl_ns(port, buf, nl)  _insl_ns((u32 *)((port)+pci_io_base), (buf), (nl))
+#define insl_ns(port, buf, nl)  _insl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
 #else
 static inline unsigned char __raw_readb(const volatile void __iomem *addr)
@@ -136,9 +136,9 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 #define insw_ns(port, buf, ns)  eeh_insw_ns((port), (buf), (ns))
 #define insl_ns(port, buf, nl)  eeh_insl_ns((port), (buf), (nl))
-#define outsb(port, buf, ns)  _outsb((u8 *)((port)+pci_io_base), (buf), (ns))
+#define outsb(port, buf, ns)  _outsb((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
-#define outsw(port, buf, ns)  _outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns))
+#define outsw(port, buf, ns)  _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
-#define outsl(port, buf, nl)  _outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl))
+#define outsl(port, buf, nl)  _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
 #endif
@@ -147,16 +147,16 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr)
 #define readl_relaxed(addr) readl(addr)
 #define readq_relaxed(addr) readq(addr)
-extern void _insb(volatile u8 *port, void *buf, int ns);
+extern void _insb(volatile u8 __iomem *port, void *buf, int ns);
-extern void _outsb(volatile u8 *port, const void *buf, int ns);
+extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);
-extern void _insw(volatile u16 *port, void *buf, int ns);
+extern void _insw(volatile u16 __iomem *port, void *buf, int ns);
-extern void _outsw(volatile u16 *port, const void *buf, int ns);
+extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);
-extern void _insl(volatile u32 *port, void *buf, int nl);
+extern void _insl(volatile u32 __iomem *port, void *buf, int nl);
-extern void _outsl(volatile u32 *port, const void *buf, int nl);
+extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);
-extern void _insw_ns(volatile u16 *port, void *buf, int ns);
+extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);
-extern void _outsw_ns(volatile u16 *port, const void *buf, int ns);
+extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
-extern void _insl_ns(volatile u32 *port, void *buf, int nl);
+extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);
-extern void _outsl_ns(volatile u32 *port, const void *buf, int nl);
+extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);
 #define mmiowb()
@@ -176,8 +176,8 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl);
 * Neither do the standard versions now, these are just here
 * for older code.
 */
-#define outsw_ns(port, buf, ns) _outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns))
+#define outsw_ns(port, buf, ns) _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
-#define outsl_ns(port, buf, nl) _outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl))
+#define outsl_ns(port, buf, nl) _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
 #define IO_SPACE_LIMIT ~(0UL)
diff --git a/include/asm-ppc64/msgbuf.h b/include/asm-ppc64/msgbuf.h
deleted file mode 100644
index 31c1cbf133cc..000000000000
--- a/include/asm-ppc64/msgbuf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _PPC64_MSGBUF_H
-#define _PPC64_MSGBUF_H
-/* 
- * The msqid64_ds structure for the PPC architecture.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-struct msqid64_ds {
-        struct ipc64_perm msg_perm;
-        __kernel_time_t msg_stime;      /* last msgsnd time */
-        __kernel_time_t msg_rtime;      /* last msgrcv time */
-        __kernel_time_t msg_ctime;      /* last change time */
-        unsigned long  msg_cbytes;      /* current number of bytes on queue */
-        unsigned long  msg_qnum;        /* number of messages in queue */
-        unsigned long  msg_qbytes;      /* max number of bytes on queue */
-        __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
-        __kernel_pid_t msg_lrpid;       /* last receive pid */
-        unsigned long  __unused1;
-        unsigned long  __unused2;
-};
-#endif /* _PPC64_MSGBUF_H */
diff --git a/include/asm-ppc64/param.h b/include/asm-ppc64/param.h
deleted file mode 100644
index 76c212d475b3..000000000000
--- a/include/asm-ppc64/param.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _ASM_PPC64_PARAM_H
-#define _ASM_PPC64_PARAM_H
-#include <linux/config.h>
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#ifdef __KERNEL__
-# define HZ             CONFIG_HZ       /* Internal kernel timer frequency */
-# define USER_HZ        100             /* .. some user interfaces are in "ticks" */
-# define CLOCKS_PER_SEC (USER_HZ)       /* like times() */
-#endif
-#ifndef HZ
-#define HZ 100
-#endif
-#define EXEC_PAGESIZE   4096
-#ifndef NOGROUP
-#define NOGROUP         (-1)
-#endif
-#define MAXHOSTNAMELEN  64      /* max length of hostname */
-#endif /* _ASM_PPC64_PARAM_H */
diff --git a/include/asm-ppc64/pci-bridge.h b/include/asm-ppc64/pci-bridge.h
index c4f9023ea5ed..6b4a5b1f695e 100644
--- a/include/asm-ppc64/pci-bridge.h
+++ b/include/asm-ppc64/pci-bridge.h
@@ -48,19 +48,52 @@ struct pci_controller {
        unsigned long dma_window_size;
 };
+/*
+ * PCI stuff, for nodes representing PCI devices, pointed to
+ * by device_node->data.
+ */
+struct pci_controller;
+struct iommu_table;
+struct pci_dn {
+        int     busno;                  /* for pci devices */
+        int     bussubno;               /* for pci devices */
+        int     devfn;                  /* for pci devices */
+        int     eeh_mode;               /* See eeh.h for possible EEH_MODEs */
+        int     eeh_config_addr;
+        int     eeh_capable;            /* from firmware */
+        int     eeh_check_count;        /* # times driver ignored error */
+        int     eeh_freeze_count;       /* # times this device froze up. */
+        int     eeh_is_bridge;          /* device is pci-to-pci bridge */
+        int     pci_ext_config_space;   /* for pci devices */
+        struct  pci_controller *phb;    /* for pci devices */
+        struct  iommu_table *iommu_table;       /* for phb's or bridges */
+        struct  pci_dev *pcidev;        /* back-pointer to the pci device */
+        struct  device_node *node;      /* back-pointer to the device_node */
+        u32     config_space[16];       /* saved PCI config space */
+};
+/* Get the pointer to a device_node's pci_dn */
+#define PCI_DN(dn)      ((struct pci_dn *) (dn)->data)
 struct device_node *fetch_dev_dn(struct pci_dev *dev);
-/* Get a device_node from a pci_dev.  This code must be fast except in the case
+/* Get a device_node from a pci_dev.  This code must be fast except
- * where the sysdata is incorrect and needs to be fixed up (hopefully just once)
+ * in the case where the sysdata is incorrect and needs to be fixed
+ * up (this will only happen once).
+ * In this case the sysdata will have been inherited from a PCI host
+ * bridge or a PCI-PCI bridge further up the tree, so it will point
+ * to a valid struct pci_dn, just not the one we want.
 */
 static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)
 {
        struct device_node *dn = dev->sysdata;
+        struct pci_dn *pdn = dn->data;
-        if (dn->devfn == dev->devfn && dn->busno == dev->bus->number)
+        if (pdn && pdn->devfn == dev->devfn && pdn->busno == dev->bus->number)
                return dn;      /* fast path.  sysdata is good */
-        else
+        return fetch_dev_dn(dev);
-                return fetch_dev_dn(dev);
 }
 static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
@@ -83,7 +116,7 @@ static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus)
        struct device_node *busdn = bus->sysdata;
        BUG_ON(busdn == NULL);
-        return busdn->phb;
+        return PCI_DN(busdn)->phb;
 }
 #endif
diff --git a/include/asm-ppc64/prom.h b/include/asm-ppc64/prom.h
index dc5330b39509..c02ec1d6b909 100644
--- a/include/asm-ppc64/prom.h
+++ b/include/asm-ppc64/prom.h
@@ -116,14 +116,6 @@ struct property {
        struct property *next;
 };
-/* NOTE: the device_node contains PCI specific info for pci devices.
- * This perhaps could be hung off the device_node with another struct,
- * but for now it is directly in the node.  The phb ptr is a good
- * indication of a real PCI node.  Other nodes leave these fields zeroed.
- */
-struct pci_controller;
-struct iommu_table;
 struct device_node {
        char    *name;
        char    *type;
@@ -135,16 +127,6 @@ struct device_node {
        struct  interrupt_info *intrs;
        char    *full_name;
-        /* PCI stuff probably doesn't belong here */
-        int     busno;                  /* for pci devices */
-        int     bussubno;               /* for pci devices */
-        int     devfn;                  /* for pci devices */
-        int     eeh_mode;               /* See eeh.h for possible EEH_MODEs */
-        int     eeh_config_addr;
-        int     pci_ext_config_space;   /* for pci devices */
-        struct  pci_controller *phb;    /* for pci devices */
-        struct  iommu_table *iommu_table;       /* for phb's or bridges */
        struct  property *properties;
        struct  device_node *parent;
        struct  device_node *child;
@@ -154,6 +136,7 @@ struct device_node {
        struct  proc_dir_entry *pde;    /* this node's proc directory */
        struct  kref kref;
        unsigned long _flags;
+        void    *data;
 };
 extern struct device_node *of_chosen;
diff --git a/include/asm-ppc64/segment.h b/include/asm-ppc64/segment.h
deleted file mode 100644
index d80fb68cc79e..000000000000
--- a/include/asm-ppc64/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __PPC64_SEGMENT_H
-#define __PPC64_SEGMENT_H
-/* Only here because we have some old header files that expect it.. */
-#endif /* __PPC64_SEGMENT_H */
diff --git a/include/asm-ppc64/setup.h b/include/asm-ppc64/setup.h
deleted file mode 100644
index b257b8348c73..000000000000
--- a/include/asm-ppc64/setup.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PPC_SETUP_H
-#define _PPC_SETUP_H
-#define COMMAND_LINE_SIZE 512
-#endif /* _PPC_SETUP_H */
diff --git a/include/asm-ppc64/timex.h b/include/asm-ppc64/timex.h
deleted file mode 100644
index 8db4da4064cd..000000000000
--- a/include/asm-ppc64/timex.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * linux/include/asm-ppc/timex.h
- *
- * PPC64 architecture timex specifications
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#ifndef _ASMPPC64_TIMEX_H
-#define _ASMPPC64_TIMEX_H
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
-typedef unsigned long cycles_t;
-static inline cycles_t get_cycles(void)
-{
-        cycles_t ret;
-        __asm__ __volatile__("mftb %0" : "=r" (ret) : );
-        return ret;
-}
-#endif
diff --git a/include/asm-ppc64/user.h b/include/asm-ppc64/user.h
deleted file mode 100644
index d7d6554a421f..000000000000
--- a/include/asm-ppc64/user.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _PPC_USER_H
-#define _PPC_USER_H
-/* Adapted from <asm-alpha/user.h> 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <asm/ptrace.h>
-#include <asm/page.h>
-/*
- * Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the `trad-core' bfd, NOT the osf-core).  The file contents
- * are as follows:
- *
- *  upage: 1 page consisting of a user struct that tells gdb
- *      what is present in the file.  Directly after this is a
- *      copy of the task_struct, which is currently not used by gdb,
- *      but it may come in handy at some point.  All of the registers
- *      are stored as part of the upage.  The upage should always be
- *      only one page long.
- *  data: The data segment follows next.  We use current->end_text to
- *      current->brk to pick up all of the user variables, plus any memory
- *      that may have been sbrk'ed.  No attempt is made to determine if a
- *      page is demand-zero or if a page is totally unused, we just cover
- *      the entire range.  All of the addresses are rounded in such a way
- *      that an integral number of pages is written.
- *  stack: We need the stack information in order to get a meaningful
- *      backtrace.  We need to write the data from usp to
- *      current->start_stack, so we round each of these in order to be able
- *      to write an integer number of pages.
- */
-struct user {
-        struct pt_regs  regs;                   /* entire machine state */
-        size_t          u_tsize;                /* text size (pages) */
-        size_t          u_dsize;                /* data size (pages) */
-        size_t          u_ssize;                /* stack size (pages) */
-        unsigned long   start_code;             /* text starting address */
-        unsigned long   start_data;             /* data starting address */
-        unsigned long   start_stack;            /* stack starting address */
-        long int        signal;                 /* signal causing core dump */
-        struct regs *   u_ar0;                  /* help gdb find registers */
-        unsigned long   magic;                  /* identifies a core file */
-        char            u_comm[32];             /* user command name */
-};
-#define NBPG                    PAGE_SIZE
-#define UPAGES                  1
-#define HOST_TEXT_START_ADDR    (u.start_code)
-#define HOST_DATA_START_ADDR    (u.start_data)
-#define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
-#endif /* _PPC_USER_H */
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h
index 831e52ee45b5..614a8c13b721 100644
--- a/include/asm-sh/irq.h
+++ b/include/asm-sh/irq.h
@@ -587,10 +587,6 @@ static inline int generic_irq_demux(int irq)
 #define irq_canonicalize(irq)   (irq)
 #define irq_demux(irq)          __irq_demux(sh_mv.mv_irq_demux(irq))
-struct irqaction;
-struct pt_regs;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
 #if defined(CONFIG_CPU_SUBTYPE_SH73180)
 #include <asm/irq-sh73180.h>
 #endif
diff --git a/include/asm-x86_64/irq.h b/include/asm-x86_64/irq.h
index 4482657777bb..fb724ba37ae6 100644
--- a/include/asm-x86_64/irq.h
+++ b/include/asm-x86_64/irq.h
@@ -48,10 +48,6 @@ static __inline__ int irq_canonicalize(int irq)
 #define ARCH_HAS_NMI_WATCHDOG           /* See include/linux/nmi.h */
 #endif
-struct irqaction;
-struct pt_regs;
-int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
 #ifdef CONFIG_HOTPLUG_CPU
 #include <linux/cpumask.h>
 extern void fixup_irqs(cpumask_t map);
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h
index f7f0913cd110..c1237aa92e38 100644
--- a/include/linux/bfs_fs.h
+++ b/include/linux/bfs_fs.h
@@ -14,8 +14,9 @@
 #define BFS_INODES_PER_BLOCK    8
 /* SVR4 vnode type values (bfs_inode->i_vtype) */
-#define BFS_VDIR                2
+#define BFS_VDIR 2L
-#define BFS_VREG                1
+#define BFS_VREG 1L
 /* BFS inode layout on disk */
 struct bfs_inode {
@@ -58,22 +59,22 @@ struct bfs_super_block {
        __u32 s_padding[118];
 };
-#define BFS_NZFILESIZE(ip) \
-        (((ip)->i_eoffset + 1) - (ip)->i_sblock * BFS_BSIZE)
-#define BFS_FILESIZE(ip) \
-        ((ip)->i_sblock == 0 ? 0 : BFS_NZFILESIZE(ip))
-#define BFS_FILEBLOCKS(ip) \
-        ((ip)->i_sblock == 0 ? 0 : ((ip)->i_eblock + 1) - (ip)->i_sblock)
 #define BFS_OFF2INO(offset) \
        ((((offset) - BFS_BSIZE) / sizeof(struct bfs_inode)) + BFS_ROOT_INO)
 #define BFS_INO2OFF(ino) \
        ((__u32)(((ino) - BFS_ROOT_INO) * sizeof(struct bfs_inode)) + BFS_BSIZE)
+#define BFS_NZFILESIZE(ip) \
+        ((cpu_to_le32((ip)->i_eoffset) + 1) -  cpu_to_le32((ip)->i_sblock) * BFS_BSIZE)
+#define BFS_FILESIZE(ip) \
+        ((ip)->i_sblock == 0 ? 0 : BFS_NZFILESIZE(ip))
+#define BFS_FILEBLOCKS(ip) \
+        ((ip)->i_sblock == 0 ? 0 : (cpu_to_le32((ip)->i_eblock) + 1) -  cpu_to_le32((ip)->i_sblock))
 #define BFS_UNCLEAN(bfs_sb, sb) \
-        ((bfs_sb->s_from != -1) && (bfs_sb->s_to != -1) && !(sb->s_flags & MS_RDONLY))
+        ((cpu_to_le32(bfs_sb->s_from) != -1) && (cpu_to_le32(bfs_sb->s_to) != -1) && !(sb->s_flags & MS_RDONLY))
 #endif  /* _LINUX_BFS_FS_H */
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 007c290f74d4..8bf4bacb5051 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -432,7 +432,10 @@ struct dccp_sock {
        struct ccid                     *dccps_hc_rx_ccid;
        struct ccid                     *dccps_hc_tx_ccid;
        struct dccp_options_received    dccps_options_received;
+        struct timeval                  dccps_epoch;
        enum dccp_role                  dccps_role:2;
+        __u8                            dccps_hc_rx_insert_options:1;
+        __u8                            dccps_hc_tx_insert_options:1;
 };
 
 static inline struct dccp_sock *dccp_sk(const struct sock *sk)
diff --git a/include/linux/fb.h b/include/linux/fb.h
index bc24beeed971..82e39cd0c4fb 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -107,6 +107,8 @@
 #define FB_ACCEL_NV_20          44      /* nVidia Arch 20               */
 #define FB_ACCEL_NV_30          45      /* nVidia Arch 30               */
 #define FB_ACCEL_NV_40          46      /* nVidia Arch 40               */
+#define FB_ACCEL_XGI_VOLARI_V   47      /* XGI Volari V3XT, V5, V8      */
+#define FB_ACCEL_XGI_VOLARI_Z   48      /* XGI Volari Z7                */
 #define FB_ACCEL_NEOMAGIC_NM2070 90     /* NeoMagic NM2070              */
 #define FB_ACCEL_NEOMAGIC_NM2090 91     /* NeoMagic NM2090              */
 #define FB_ACCEL_NEOMAGIC_NM2093 92     /* NeoMagic NM2093              */
@@ -495,6 +497,9 @@ struct fb_cursor_user {
 #define FB_EVENT_BLANK                  0x08
 /*      Private modelist is to be replaced */
 #define FB_EVENT_NEW_MODELIST           0x09
+/*      The resolution of the passed in fb_info about to change and
+        all vc's should be changed         */
+#define FB_EVENT_MODE_CHANGE_ALL        0x0A
 struct fb_event {
        struct fb_info *info;
@@ -820,13 +825,29 @@ extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx,
                                u32 height, u32 shift_high, u32 shift_low, u32 mod);
 extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height);
 extern void fb_set_suspend(struct fb_info *info, int state);
-extern int fb_get_color_depth(struct fb_var_screeninfo *var);
+extern int fb_get_color_depth(struct fb_var_screeninfo *var,
+                              struct fb_fix_screeninfo *fix);
 extern int fb_get_options(char *name, char **option);
 extern int fb_new_modelist(struct fb_info *info);
 extern struct fb_info *registered_fb[FB_MAX];
 extern int num_registered_fb;
+static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
+                                           u8 *src, u32 s_pitch, u32 height)
+{
+        int i, j;
+        d_pitch -= s_pitch;
+        for (i = height; i--; ) {
+                /* s_pitch is a few bytes at the most, memcpy is suboptimal */
+                for (j = 0; j < s_pitch; j++)
+                        *dst++ = *src++;
+                dst += d_pitch;
+        }
+}
 /* drivers/video/fbsysfs.c */
 extern struct fb_info *framebuffer_alloc(size_t size, struct device *dev);
 extern void framebuffer_release(struct fb_info *info);
@@ -856,8 +877,11 @@ extern int fb_get_mode(int flags, u32 val, struct fb_var_screeninfo *var,
 extern int fb_validate_mode(const struct fb_var_screeninfo *var,
                            struct fb_info *info);
 extern int fb_parse_edid(unsigned char *edid, struct fb_var_screeninfo *var);
-extern void fb_edid_to_monspecs(unsigned char *edid, struct fb_monspecs *specs);
+extern const unsigned char *fb_firmware_edid(struct device *device);
+extern void fb_edid_to_monspecs(unsigned char *edid,
+                                struct fb_monspecs *specs);
 extern void fb_destroy_modedb(struct fb_videomode *modedb);
+extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
 /* drivers/video/modedb.c */
 #define VESA_MODEDB_SIZE 34
diff --git a/include/linux/file.h b/include/linux/file.h
index 5206beb9a80e..f5bbd4c508b3 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -9,6 +9,7 @@
 #include <linux/posix_types.h>
 #include <linux/compiler.h>
 #include <linux/spinlock.h>
+#include <linux/rcupdate.h>
 /*
 * The default fd array needs to be at least BITS_PER_LONG,
@@ -16,23 +17,33 @@
 */
 #define NR_OPEN_DEFAULT BITS_PER_LONG
+struct fdtable {
+        unsigned int max_fds;
+        int max_fdset;
+        int next_fd;
+        struct file ** fd;      /* current fd array */
+        fd_set *close_on_exec;
+        fd_set *open_fds;
+        struct rcu_head rcu;
+        struct files_struct *free_files;
+        struct fdtable *next;
+};
 /*
 * Open file table structure
 */
 struct files_struct {
        atomic_t count;
        spinlock_t file_lock;     /* Protects all the below members.  Nests inside tsk->alloc_lock */
-        int max_fds;
+        struct fdtable *fdt;
-        int max_fdset;
+        struct fdtable fdtab;
-        int next_fd;
-        struct file ** fd;      /* current fd array */
-        fd_set *close_on_exec;
-        fd_set *open_fds;
        fd_set close_on_exec_init;
        fd_set open_fds_init;
        struct file * fd_array[NR_OPEN_DEFAULT];
 };
+#define files_fdtable(files) (rcu_dereference((files)->fdt))
 extern void FASTCALL(__fput(struct file *));
 extern void FASTCALL(fput(struct file *));
@@ -59,13 +70,16 @@ extern fd_set *alloc_fdset(int);
 extern void free_fdset(fd_set *, int);
 extern int expand_files(struct files_struct *, int nr);
+extern void free_fdtable(struct fdtable *fdt);
+extern void __init files_defer_init(void);
 static inline struct file * fcheck_files(struct files_struct *files, unsigned int fd)
 {
        struct file * file = NULL;
+        struct fdtable *fdt = files_fdtable(files);
-        if (fd < files->max_fds)
+        if (fd < fdt->max_fds)
-                file = files->fd[fd];
+                file = rcu_dereference(fdt->fd[fd]);
        return file;
 }
diff --git a/include/linux/fs.h b/include/linux/fs.h
index fd93ab7da905..7f61227827d7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -9,6 +9,7 @@
 #include <linux/config.h>
 #include <linux/limits.h>
 #include <linux/ioctl.h>
+#include <linux/rcuref.h>
 /*
 * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
@@ -597,12 +598,13 @@ struct file {
        spinlock_t              f_ep_lock;
 #endif /* #ifdef CONFIG_EPOLL */
        struct address_space    *f_mapping;
+        struct rcu_head         f_rcuhead;
 };
 extern spinlock_t files_lock;
 #define file_list_lock() spin_lock(&files_lock);
 #define file_list_unlock() spin_unlock(&files_lock);
-#define get_file(x)     atomic_inc(&(x)->f_count)
+#define get_file(x)     rcuref_inc(&(x)->f_count)
 #define file_count(x)   atomic_read(&(x)->f_count)
 #define MAX_NON_LFS     ((1UL<<31) - 1)
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
new file mode 100644
index 000000000000..acbeb96a3353
--- /dev/null
+++ b/include/linux/fuse.h
@@ -0,0 +1,259 @@
+/*
+    FUSE: Filesystem in Userspace
+    Copyright (C) 2001-2005  Miklos Szeredi <miklos@szeredi.hu>
+    This program can be distributed under the terms of the GNU GPL.
+    See the file COPYING.
+*/
+/* This file defines the kernel interface of FUSE */
+#include <asm/types.h>
+/** Version number of this interface */
+#define FUSE_KERNEL_VERSION 7
+/** Minor version number of this interface */
+#define FUSE_KERNEL_MINOR_VERSION 2
+/** The node ID of the root inode */
+#define FUSE_ROOT_ID 1
+/** The major number of the fuse character device */
+#define FUSE_MAJOR 10
+/** The minor number of the fuse character device */
+#define FUSE_MINOR 229
+/* Make sure all structures are padded to 64bit boundary, so 32bit
+   userspace works under 64bit kernels */
+struct fuse_attr {
+        __u64   ino;
+        __u64   size;
+        __u64   blocks;
+        __u64   atime;
+        __u64   mtime;
+        __u64   ctime;
+        __u32   atimensec;
+        __u32   mtimensec;
+        __u32   ctimensec;
+        __u32   mode;
+        __u32   nlink;
+        __u32   uid;
+        __u32   gid;
+        __u32   rdev;
+};
+struct fuse_kstatfs {
+        __u64   blocks;
+        __u64   bfree;
+        __u64   bavail;
+        __u64   files;
+        __u64   ffree;
+        __u32   bsize;
+        __u32   namelen;
+};
+#define FATTR_MODE      (1 << 0)
+#define FATTR_UID       (1 << 1)
+#define FATTR_GID       (1 << 2)
+#define FATTR_SIZE      (1 << 3)
+#define FATTR_ATIME     (1 << 4)
+#define FATTR_MTIME     (1 << 5)
+#define FATTR_CTIME     (1 << 6)
+/**
+ * Flags returned by the OPEN request
+ *
+ * FOPEN_DIRECT_IO: bypass page cache for this open file
+ * FOPEN_KEEP_CACHE: don't invalidate the data cache on open
+ */
+#define FOPEN_DIRECT_IO         (1 << 0)
+#define FOPEN_KEEP_CACHE        (1 << 1)
+enum fuse_opcode {
+        FUSE_LOOKUP        = 1,
+        FUSE_FORGET        = 2,  /* no reply */
+        FUSE_GETATTR       = 3,
+        FUSE_SETATTR       = 4,
+        FUSE_READLINK      = 5,
+        FUSE_SYMLINK       = 6,
+        FUSE_MKNOD         = 8,
+        FUSE_MKDIR         = 9,
+        FUSE_UNLINK        = 10,
+        FUSE_RMDIR         = 11,
+        FUSE_RENAME        = 12,
+        FUSE_LINK          = 13,
+        FUSE_OPEN          = 14,
+        FUSE_READ          = 15,
+        FUSE_WRITE         = 16,
+        FUSE_STATFS        = 17,
+        FUSE_RELEASE       = 18,
+        FUSE_FSYNC         = 20,
+        FUSE_SETXATTR      = 21,
+        FUSE_GETXATTR      = 22,
+        FUSE_LISTXATTR     = 23,
+        FUSE_REMOVEXATTR   = 24,
+        FUSE_FLUSH         = 25,
+        FUSE_INIT          = 26,
+        FUSE_OPENDIR       = 27,
+        FUSE_READDIR       = 28,
+        FUSE_RELEASEDIR    = 29,
+        FUSE_FSYNCDIR      = 30
+};
+/* Conservative buffer size for the client */
+#define FUSE_MAX_IN 8192
+#define FUSE_NAME_MAX 1024
+#define FUSE_SYMLINK_MAX 4096
+#define FUSE_XATTR_SIZE_MAX 4096
+struct fuse_entry_out {
+        __u64   nodeid;         /* Inode ID */
+        __u64   generation;     /* Inode generation: nodeid:gen must
+                                   be unique for the fs's lifetime */
+        __u64   entry_valid;    /* Cache timeout for the name */
+        __u64   attr_valid;     /* Cache timeout for the attributes */
+        __u32   entry_valid_nsec;
+        __u32   attr_valid_nsec;
+        struct fuse_attr attr;
+};
+struct fuse_forget_in {
+        __u64   nlookup;
+};
+struct fuse_attr_out {
+        __u64   attr_valid;     /* Cache timeout for the attributes */
+        __u32   attr_valid_nsec;
+        __u32   dummy;
+        struct fuse_attr attr;
+};
+struct fuse_mknod_in {
+        __u32   mode;
+        __u32   rdev;
+};
+struct fuse_mkdir_in {
+        __u32   mode;
+        __u32   padding;
+};
+struct fuse_rename_in {
+        __u64   newdir;
+};
+struct fuse_link_in {
+        __u64   oldnodeid;
+};
+struct fuse_setattr_in {
+        __u32   valid;
+        __u32   padding;
+        struct fuse_attr attr;
+};
+struct fuse_open_in {
+        __u32   flags;
+        __u32   padding;
+};
+struct fuse_open_out {
+        __u64   fh;
+        __u32   open_flags;
+        __u32   padding;
+};
+struct fuse_release_in {
+        __u64   fh;
+        __u32   flags;
+        __u32   padding;
+};
+struct fuse_flush_in {
+        __u64   fh;
+        __u32   flush_flags;
+        __u32   padding;
+};
+struct fuse_read_in {
+        __u64   fh;
+        __u64   offset;
+        __u32   size;
+        __u32   padding;
+};
+struct fuse_write_in {
+        __u64   fh;
+        __u64   offset;
+        __u32   size;
+        __u32   write_flags;
+};
+struct fuse_write_out {
+        __u32   size;
+        __u32   padding;
+};
+struct fuse_statfs_out {
+        struct fuse_kstatfs st;
+};
+struct fuse_fsync_in {
+        __u64   fh;
+        __u32   fsync_flags;
+        __u32   padding;
+};
+struct fuse_setxattr_in {
+        __u32   size;
+        __u32   flags;
+};
+struct fuse_getxattr_in {
+        __u32   size;
+        __u32   padding;
+};
+struct fuse_getxattr_out {
+        __u32   size;
+        __u32   padding;
+};
+struct fuse_init_in_out {
+        __u32   major;
+        __u32   minor;
+};
+struct fuse_in_header {
+        __u32   len;
+        __u32   opcode;
+        __u64   unique;
+        __u64   nodeid;
+        __u32   uid;
+        __u32   gid;
+        __u32   pid;
+        __u32   padding;
+};
+struct fuse_out_header {
+        __u32   len;
+        __s32   error;
+        __u64   unique;
+};
+struct fuse_dirent {
+        __u64   ino;
+        __u64   off;
+        __u32   namelen;
+        __u32   type;
+        char name[0];
+};
+#define FUSE_NAME_OFFSET ((unsigned) ((struct fuse_dirent *) 0)->name)
+#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
+#define FUSE_DIRENT_SIZE(d) \
+        FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index c727c195a91a..68ab5f2ab9cd 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -2,17 +2,27 @@
 #define _LINUX__INIT_TASK_H
 #include <linux/file.h>
+#include <linux/rcupdate.h>
-#define INIT_FILES \
+#define INIT_FDTABLE \
-{                                                       \
+{                                                       \
-        .count          = ATOMIC_INIT(1),               \
-        .file_lock      = SPIN_LOCK_UNLOCKED,           \
        .max_fds        = NR_OPEN_DEFAULT,              \
        .max_fdset      = __FD_SETSIZE,                 \
        .next_fd        = 0,                            \
        .fd             = &init_files.fd_array[0],      \
        .close_on_exec  = &init_files.close_on_exec_init, \
        .open_fds       = &init_files.open_fds_init,    \
+        .rcu            = RCU_HEAD_INIT,                \
+        .free_files     = NULL,                         \
+        .next           = NULL,                         \
+}
+#define INIT_FILES \
+{                                                       \
+        .count          = ATOMIC_INIT(1),               \
+        .file_lock      = SPIN_LOCK_UNLOCKED,           \
+        .fdt            = &init_files.fdtab,            \
+        .fdtab          = INIT_FDTABLE,                 \
        .close_on_exec_init = { { 0, } },               \
        .open_fds_init  = { { 0, } },                   \
        .fd_array       = { NULL, }                     \
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9c7aecf0c599..e5e24e13a114 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -329,6 +329,7 @@ extern struct pci_dev *pci_dev_get(struct pci_dev *dev);
 extern void pci_dev_put(struct pci_dev *dev);
 extern void pci_remove_bus(struct pci_bus *b);
 extern void pci_remove_bus_device(struct pci_dev *dev);
+void pci_setup_cardbus(struct pci_bus *bus);
 /* Generic PCI functions exported to card drivers */
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index fd276adf0fd5..4e65eb44adfd 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -52,8 +52,8 @@ struct rcu_head {
        void (*func)(struct rcu_head *head);
 };
-#define RCU_HEAD_INIT(head) { .next = NULL, .func = NULL }
+#define RCU_HEAD_INIT   { .next = NULL, .func = NULL }
-#define RCU_HEAD(head) struct rcu_head head = RCU_HEAD_INIT(head)
+#define RCU_HEAD(head) struct rcu_head head = RCU_HEAD_INIT
 #define INIT_RCU_HEAD(ptr) do { \
       (ptr)->next = NULL; (ptr)->func = NULL; \
 } while (0)
diff --git a/include/linux/rcuref.h b/include/linux/rcuref.h
new file mode 100644
index 000000000000..e1adbba14b67
--- /dev/null
+++ b/include/linux/rcuref.h
@@ -0,0 +1,220 @@
+/*
+ * rcuref.h
+ *
+ * Reference counting for elements of lists/arrays protected by
+ * RCU.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (C) IBM Corporation, 2005
+ *
+ * Author: Dipankar Sarma <dipankar@in.ibm.com>
+ *         Ravikiran Thirumalai <kiran_th@gmail.com>
+ *
+ * See Documentation/RCU/rcuref.txt for detailed user guide.
+ *
+ */
+#ifndef _RCUREF_H_
+#define _RCUREF_H_
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <asm/atomic.h>
+/*
+ * These APIs work on traditional atomic_t counters used in the
+ * kernel for reference counting. Under special circumstances
+ * where a lock-free get() operation races with a put() operation
+ * these APIs can be used. See Documentation/RCU/rcuref.txt.
+ */
+#ifdef __HAVE_ARCH_CMPXCHG
+/**
+ * rcuref_inc - increment refcount for object.
+ * @rcuref: reference counter in the object in question.
+ *
+ * This should be used only for objects where we use RCU and
+ * use the rcuref_inc_lf() api to acquire a reference
+ * in a lock-free reader-side critical section.
+ */
+static inline void rcuref_inc(atomic_t *rcuref)
+{
+        atomic_inc(rcuref);
+}
+/**
+ * rcuref_dec - decrement refcount for object.
+ * @rcuref: reference counter in the object in question.
+ *
+ * This should be used only for objects where we use RCU and
+ * use the rcuref_inc_lf() api to acquire a reference
+ * in a lock-free reader-side critical section.
+ */
+static inline void rcuref_dec(atomic_t *rcuref)
+{
+        atomic_dec(rcuref);
+}
+/**
+ * rcuref_dec_and_test - decrement refcount for object and test
+ * @rcuref: reference counter in the object.
+ * @release: pointer to the function that will clean up the object
+ *           when the last reference to the object is released.
+ *           This pointer is required.
+ *
+ * Decrement the refcount, and if 0, return 1. Else return 0.
+ *
+ * This should be used only for objects where we use RCU and
+ * use the rcuref_inc_lf() api to acquire a reference
+ * in a lock-free reader-side critical section.
+ */
+static inline int rcuref_dec_and_test(atomic_t *rcuref)
+{
+        return atomic_dec_and_test(rcuref);
+}
+/*
+ * cmpxchg is needed on UP too, if deletions to the list/array can happen
+ * in interrupt context.
+ */
+/**
+ * rcuref_inc_lf - Take reference to an object in a read-side
+ * critical section protected by RCU.
+ * @rcuref: reference counter in the object in question.
+ *
+ * Try and increment the refcount by 1.  The increment might fail if
+ * the reference counter has been through a 1 to 0 transition and
+ * is no longer part of the lock-free list.
+ * Returns non-zero on successful increment and zero otherwise.
+ */
+static inline int rcuref_inc_lf(atomic_t *rcuref)
+{
+        int c, old;
+        c = atomic_read(rcuref);
+        while (c && (old = cmpxchg(&rcuref->counter, c, c + 1)) != c)
+                c = old;
+        return c;
+}
+#else                           /* !__HAVE_ARCH_CMPXCHG */
+extern spinlock_t __rcuref_hash[];
+/*
+ * Use a hash table of locks to protect the reference count
+ * since cmpxchg is not available in this arch.
+ */
+#ifdef  CONFIG_SMP
+#define RCUREF_HASH_SIZE        4
+#define RCUREF_HASH(k) \
+        (&__rcuref_hash[(((unsigned long)k)>>8) & (RCUREF_HASH_SIZE-1)])
+#else
+#define RCUREF_HASH_SIZE        1
+#define RCUREF_HASH(k)  &__rcuref_hash[0]
+#endif                          /* CONFIG_SMP */
+/**
+ * rcuref_inc - increment refcount for object.
+ * @rcuref: reference counter in the object in question.
+ *
+ * This should be used only for objects where we use RCU and
+ * use the rcuref_inc_lf() api to acquire a reference in a lock-free
+ * reader-side critical section.
+ */
+static inline void rcuref_inc(atomic_t *rcuref)
+{
+        unsigned long flags;
+        spin_lock_irqsave(RCUREF_HASH(rcuref), flags);
+        rcuref->counter += 1;
+        spin_unlock_irqrestore(RCUREF_HASH(rcuref), flags);
+}
+/**
+ * rcuref_dec - decrement refcount for object.
+ * @rcuref: reference counter in the object in question.
+ *
+ * This should be used only for objects where we use RCU and
+ * use the rcuref_inc_lf() api to acquire a reference in a lock-free
+ * reader-side critical section.
+ */
+static inline void rcuref_dec(atomic_t *rcuref)
+{
+        unsigned long flags;
+        spin_lock_irqsave(RCUREF_HASH(rcuref), flags);
+        rcuref->counter -= 1;
+        spin_unlock_irqrestore(RCUREF_HASH(rcuref), flags);
+}
+/**
+ * rcuref_dec_and_test - decrement refcount for object and test
+ * @rcuref: reference counter in the object.
+ * @release: pointer to the function that will clean up the object
+ *           when the last reference to the object is released.
+ *           This pointer is required.
+ *
+ * Decrement the refcount, and if 0, return 1. Else return 0.
+ *
+ * This should be used only for objects where we use RCU and
+ * use the rcuref_inc_lf() api to acquire a reference in a lock-free
+ * reader-side critical section.
+ */
+static inline int rcuref_dec_and_test(atomic_t *rcuref)
+{
+        unsigned long flags;
+        spin_lock_irqsave(RCUREF_HASH(rcuref), flags);
+        rcuref->counter--;
+        if (!rcuref->counter) {
+                spin_unlock_irqrestore(RCUREF_HASH(rcuref), flags);
+                return 1;
+        } else {
+                spin_unlock_irqrestore(RCUREF_HASH(rcuref), flags);
+                return 0;
+        }
+}
+/**
+ * rcuref_inc_lf - Take reference to an object of a lock-free collection
+ * by traversing a lock-free list/array.
+ * @rcuref: reference counter in the object in question.
+ *
+ * Try and increment the refcount by 1.  The increment might fail if
+ * the reference counter has been through a 1 to 0 transition and
+ * object is no longer part of the lock-free list.
+ * Returns non-zero on successful increment and zero otherwise.
+ */
+static inline int rcuref_inc_lf(atomic_t *rcuref)
+{
+        int ret;
+        unsigned long flags;
+        spin_lock_irqsave(RCUREF_HASH(rcuref), flags);
+        if (rcuref->counter)
+                ret = rcuref->counter++;
+        else
+                ret = 0;
+        spin_unlock_irqrestore(RCUREF_HASH(rcuref), flags);
+        return ret;
+}
+#endif /* !__HAVE_ARCH_CMPXCHG */
+#endif /* __KERNEL__ */
+#endif /* _RCUREF_H_ */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ea1b5f32ec5c..c551e6a1447e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -604,6 +604,11 @@ extern int groups_search(struct group_info *group_info, gid_t grp);
 #define GROUP_AT(gi, i) \
    ((gi)->blocks[(i)/NGROUPS_PER_BLOCK][(i)%NGROUPS_PER_BLOCK])
+#ifdef ARCH_HAS_PREFETCH_SWITCH_STACK
+extern void prefetch_stack(struct task_struct*);
+#else
+static inline void prefetch_stack(struct task_struct *t) { }
+#endif
 struct audit_context;           /* See audit.c */
 struct mempolicy;
diff --git a/include/linux/security.h b/include/linux/security.h
index 7aab6ab7c57f..55b02e1c73f4 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -250,29 +250,37 @@ struct swap_info_struct;
 *      @inode contains the inode structure.
 *      Deallocate the inode security structure and set @inode->i_security to
 *      NULL. 
+ * @inode_init_security:
+ *      Obtain the security attribute name suffix and value to set on a newly
+ *      created inode and set up the incore security field for the new inode.
+ *      This hook is called by the fs code as part of the inode creation
+ *      transaction and provides for atomic labeling of the inode, unlike
+ *      the post_create/mkdir/... hooks called by the VFS.  The hook function
+ *      is expected to allocate the name and value via kmalloc, with the caller
+ *      being responsible for calling kfree after using them.
+ *      If the security module does not use security attributes or does
+ *      not wish to put a security attribute on this particular inode,
+ *      then it should return -EOPNOTSUPP to skip this processing.
+ *      @inode contains the inode structure of the newly created inode.
+ *      @dir contains the inode structure of the parent directory.
+ *      @name will be set to the allocated name suffix (e.g. selinux).
+ *      @value will be set to the allocated attribute value.
+ *      @len will be set to the length of the value.
+ *      Returns 0 if @name and @value have been successfully set,
+ *              -EOPNOTSUPP if no security attribute is needed, or
+ *              -ENOMEM on memory allocation failure.
 * @inode_create:
 *      Check permission to create a regular file.
 *      @dir contains inode structure of the parent of the new file.
 *      @dentry contains the dentry structure for the file to be created.
 *      @mode contains the file mode of the file to be created.
 *      Return 0 if permission is granted.
- * @inode_post_create:
- *      Set the security attributes on a newly created regular file.  This hook
- *      is called after a file has been successfully created.
- *      @dir contains the inode structure of the parent directory of the new file.
- *      @dentry contains the the dentry structure for the newly created file.
- *      @mode contains the file mode.
 * @inode_link:
 *      Check permission before creating a new hard link to a file.
 *      @old_dentry contains the dentry structure for an existing link to the file.
 *      @dir contains the inode structure of the parent directory of the new link.
 *      @new_dentry contains the dentry structure for the new link.
 *      Return 0 if permission is granted.
- * @inode_post_link:
- *      Set security attributes for a new hard link to a file.
- *      @old_dentry contains the dentry structure for the existing link.
- *      @dir contains the inode structure of the parent directory of the new file.
- *      @new_dentry contains the dentry structure for the new file link.
 * @inode_unlink:
 *      Check the permission to remove a hard link to a file. 
 *      @dir contains the inode structure of parent directory of the file.
@@ -284,13 +292,6 @@ struct swap_info_struct;
 *      @dentry contains the dentry structure of the symbolic link.
 *      @old_name contains the pathname of file.
 *      Return 0 if permission is granted.
- * @inode_post_symlink:
- *      @dir contains the inode structure of the parent directory of the new link.
- *      @dentry contains the dentry structure of new symbolic link.
- *      @old_name contains the pathname of file.
- *      Set security attributes for a newly created symbolic link.  Note that
- *      @dentry->d_inode may be NULL, since the filesystem might not
- *      instantiate the dentry (e.g. NFS).
 * @inode_mkdir:
 *      Check permissions to create a new directory in the existing directory
 *      associated with inode strcture @dir. 
@@ -298,11 +299,6 @@ struct swap_info_struct;
 *      @dentry contains the dentry structure of new directory.
 *      @mode contains the mode of new directory.
 *      Return 0 if permission is granted.
- * @inode_post_mkdir:
- *      Set security attributes on a newly created directory.
- *      @dir contains the inode structure of parent of the directory to be created.
- *      @dentry contains the dentry structure of new directory.
- *      @mode contains the mode of new directory.
 * @inode_rmdir:
 *      Check the permission to remove a directory.
 *      @dir contains the inode structure of parent of the directory to be removed.
@@ -318,13 +314,6 @@ struct swap_info_struct;
 *      @mode contains the mode of the new file.
 *      @dev contains the the device number.
 *      Return 0 if permission is granted.
- * @inode_post_mknod:
- *      Set security attributes on a newly created special file (or socket or
- *      fifo file created via the mknod system call).
- *      @dir contains the inode structure of parent of the new node.
- *      @dentry contains the dentry structure of the new node.
- *      @mode contains the mode of the new node.
- *      @dev contains the the device number.
 * @inode_rename:
 *      Check for permission to rename a file or directory.
 *      @old_dir contains the inode structure for parent of the old link.
@@ -332,12 +321,6 @@ struct swap_info_struct;
 *      @new_dir contains the inode structure for parent of the new link.
 *      @new_dentry contains the dentry structure of the new link.
 *      Return 0 if permission is granted.
- * @inode_post_rename:
- *      Set security attributes on a renamed file or directory.
- *      @old_dir contains the inode structure for parent of the old link.
- *      @old_dentry contains the dentry structure of the old link.
- *      @new_dir contains the inode structure for parent of the new link.
- *      @new_dentry contains the dentry structure of the new link.
 * @inode_readlink:
 *      Check the permission to read the symbolic link.
 *      @dentry contains the dentry structure for the file link.
@@ -1080,34 +1063,21 @@ struct security_operations {
        int (*inode_alloc_security) (struct inode *inode);      
        void (*inode_free_security) (struct inode *inode);
+        int (*inode_init_security) (struct inode *inode, struct inode *dir,
+                                    char **name, void **value, size_t *len);
        int (*inode_create) (struct inode *dir,
                             struct dentry *dentry, int mode);
-        void (*inode_post_create) (struct inode *dir,
-                                   struct dentry *dentry, int mode);
        int (*inode_link) (struct dentry *old_dentry,
                           struct inode *dir, struct dentry *new_dentry);
-        void (*inode_post_link) (struct dentry *old_dentry,
-                                 struct inode *dir, struct dentry *new_dentry);
        int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
        int (*inode_symlink) (struct inode *dir,
                              struct dentry *dentry, const char *old_name);
-        void (*inode_post_symlink) (struct inode *dir,
-                                    struct dentry *dentry,
-                                    const char *old_name);
        int (*inode_mkdir) (struct inode *dir, struct dentry *dentry, int mode);
-        void (*inode_post_mkdir) (struct inode *dir, struct dentry *dentry, 
-                            int mode);
        int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
        int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
                            int mode, dev_t dev);
-        void (*inode_post_mknod) (struct inode *dir, struct dentry *dentry,
-                                  int mode, dev_t dev);
        int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
                             struct inode *new_dir, struct dentry *new_dentry);
-        void (*inode_post_rename) (struct inode *old_dir,
-                                   struct dentry *old_dentry,
-                                   struct inode *new_dir,
-                                   struct dentry *new_dentry);
        int (*inode_readlink) (struct dentry *dentry);
        int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
        int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
@@ -1442,6 +1412,17 @@ static inline void security_inode_free (struct inode *inode)
                return;
        security_ops->inode_free_security (inode);
 }
+static inline int security_inode_init_security (struct inode *inode,
+                                                struct inode *dir,
+                                                char **name,
+                                                void **value,
+                                                size_t *len)
+{
+        if (unlikely (IS_PRIVATE (inode)))
+                return -EOPNOTSUPP;
+        return security_ops->inode_init_security (inode, dir, name, value, len);
+}
        
 static inline int security_inode_create (struct inode *dir,
                                         struct dentry *dentry,
@@ -1452,15 +1433,6 @@ static inline int security_inode_create (struct inode *dir,
        return security_ops->inode_create (dir, dentry, mode);
 }
-static inline void security_inode_post_create (struct inode *dir,
-                                               struct dentry *dentry,
-                                               int mode)
-{
-        if (dentry->d_inode && unlikely (IS_PRIVATE (dentry->d_inode)))
-                return;
-        security_ops->inode_post_create (dir, dentry, mode);
-}
 static inline int security_inode_link (struct dentry *old_dentry,
                                       struct inode *dir,
                                       struct dentry *new_dentry)
@@ -1470,15 +1442,6 @@ static inline int security_inode_link (struct dentry *old_dentry,
        return security_ops->inode_link (old_dentry, dir, new_dentry);
 }
-static inline void security_inode_post_link (struct dentry *old_dentry,
-                                             struct inode *dir,
-                                             struct dentry *new_dentry)
-{
-        if (new_dentry->d_inode && unlikely (IS_PRIVATE (new_dentry->d_inode)))
-                return;
-        security_ops->inode_post_link (old_dentry, dir, new_dentry);
-}
 static inline int security_inode_unlink (struct inode *dir,
                                         struct dentry *dentry)
 {
@@ -1496,15 +1459,6 @@ static inline int security_inode_symlink (struct inode *dir,
        return security_ops->inode_symlink (dir, dentry, old_name);
 }
-static inline void security_inode_post_symlink (struct inode *dir,
-                                                struct dentry *dentry,
-                                                const char *old_name)
-{
-        if (dentry->d_inode && unlikely (IS_PRIVATE (dentry->d_inode)))
-                return;
-        security_ops->inode_post_symlink (dir, dentry, old_name);
-}
 static inline int security_inode_mkdir (struct inode *dir,
                                        struct dentry *dentry,
                                        int mode)
@@ -1514,15 +1468,6 @@ static inline int security_inode_mkdir (struct inode *dir,
        return security_ops->inode_mkdir (dir, dentry, mode);
 }
-static inline void security_inode_post_mkdir (struct inode *dir,
-                                              struct dentry *dentry,
-                                              int mode)
-{
-        if (dentry->d_inode && unlikely (IS_PRIVATE (dentry->d_inode)))
-                return;
-        security_ops->inode_post_mkdir (dir, dentry, mode);
-}
 static inline int security_inode_rmdir (struct inode *dir,
                                        struct dentry *dentry)
 {
@@ -1540,15 +1485,6 @@ static inline int security_inode_mknod (struct inode *dir,
        return security_ops->inode_mknod (dir, dentry, mode, dev);
 }
-static inline void security_inode_post_mknod (struct inode *dir,
-                                              struct dentry *dentry,
-                                              int mode, dev_t dev)
-{
-        if (dentry->d_inode && unlikely (IS_PRIVATE (dentry->d_inode)))
-                return;
-        security_ops->inode_post_mknod (dir, dentry, mode, dev);
-}
 static inline int security_inode_rename (struct inode *old_dir,
                                         struct dentry *old_dentry,
                                         struct inode *new_dir,
@@ -1561,18 +1497,6 @@ static inline int security_inode_rename (struct inode *old_dir,
                                           new_dir, new_dentry);
 }
-static inline void security_inode_post_rename (struct inode *old_dir,
-                                               struct dentry *old_dentry,
-                                               struct inode *new_dir,
-                                               struct dentry *new_dentry)
-{
-        if (unlikely (IS_PRIVATE (old_dentry->d_inode) ||
-            (new_dentry->d_inode && IS_PRIVATE (new_dentry->d_inode))))
-                return;
-        security_ops->inode_post_rename (old_dir, old_dentry,
-                                                new_dir, new_dentry);
-}
 static inline int security_inode_readlink (struct dentry *dentry)
 {
        if (unlikely (IS_PRIVATE (dentry->d_inode)))
@@ -2171,6 +2095,15 @@ static inline int security_inode_alloc (struct inode *inode)
 static inline void security_inode_free (struct inode *inode)
 { }
+static inline int security_inode_init_security (struct inode *inode,
+                                                struct inode *dir,
+                                                char **name,
+                                                void **value,
+                                                size_t *len)
+{
+        return -EOPNOTSUPP;
+}
        
 static inline int security_inode_create (struct inode *dir,
                                         struct dentry *dentry,
@@ -2179,11 +2112,6 @@ static inline int security_inode_create (struct inode *dir,
        return 0;
 }
-static inline void security_inode_post_create (struct inode *dir,
-                                               struct dentry *dentry,
-                                               int mode)
-{ }
 static inline int security_inode_link (struct dentry *old_dentry,
                                       struct inode *dir,
                                       struct dentry *new_dentry)
@@ -2191,11 +2119,6 @@ static inline int security_inode_link (struct dentry *old_dentry,
        return 0;
 }
-static inline void security_inode_post_link (struct dentry *old_dentry,
-                                             struct inode *dir,
-                                             struct dentry *new_dentry)
-{ }
 static inline int security_inode_unlink (struct inode *dir,
                                         struct dentry *dentry)
 {
@@ -2209,11 +2132,6 @@ static inline int security_inode_symlink (struct inode *dir,
        return 0;
 }
-static inline void security_inode_post_symlink (struct inode *dir,
-                                                struct dentry *dentry,
-                                                const char *old_name)
-{ }
 static inline int security_inode_mkdir (struct inode *dir,
                                        struct dentry *dentry,
                                        int mode)
@@ -2221,11 +2139,6 @@ static inline int security_inode_mkdir (struct inode *dir,
        return 0;
 }
-static inline void security_inode_post_mkdir (struct inode *dir,
-                                              struct dentry *dentry,
-                                              int mode)
-{ }
 static inline int security_inode_rmdir (struct inode *dir,
                                        struct dentry *dentry)
 {
@@ -2239,11 +2152,6 @@ static inline int security_inode_mknod (struct inode *dir,
        return 0;
 }
-static inline void security_inode_post_mknod (struct inode *dir,
-                                              struct dentry *dentry,
-                                              int mode, dev_t dev)
-{ }
 static inline int security_inode_rename (struct inode *old_dir,
                                         struct dentry *old_dentry,
                                         struct inode *new_dir,
@@ -2252,12 +2160,6 @@ static inline int security_inode_rename (struct inode *old_dir,
        return 0;
 }
-static inline void security_inode_post_rename (struct inode *old_dir,
-                                               struct dentry *old_dentry,
-                                               struct inode *new_dir,
-                                               struct dentry *new_dentry)
-{ }
 static inline int security_inode_readlink (struct dentry *dentry)
 {
        return 0;
diff --git a/include/linux/timer.h b/include/linux/timer.h
index 221f81ac2002..3340f3bd135d 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -32,6 +32,10 @@ extern struct timer_base_s __init_timer_base;
                .magic = TIMER_MAGIC,                           \
        }
+#define DEFINE_TIMER(_name, _function, _expires, _data)         \
+        struct timer_list _name =                               \
+                TIMER_INITIALIZER(_function, _expires, _data)
 void fastcall init_timer(struct timer_list * timer);
 /***
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 59ff42c629ec..1267f88ece6e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -74,7 +74,8 @@ struct screen_info {
        u16 vesapm_off;         /* 0x30 */
        u16 pages;              /* 0x32 */
        u16 vesa_attributes;    /* 0x34 */
-                                /* 0x36 -- 0x3f reserved for future expansion */
+        u32  capabilities;      /* 0x36 */
+                                /* 0x3a -- 0x3f reserved for future expansion */
 };
 extern struct screen_info screen_info;
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 9d6fbde3d29c..1cc8c31b7988 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -3,7 +3,6 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #define HAVE_V4L2 1
 #include <linux/videodev2.h>
@@ -29,7 +28,6 @@ struct video_device
        void (*release)(struct video_device *vfd);
-#if 1 /* to be removed in 2.7.x */
        /* obsolete -- fops->owner is used instead */
        struct module *owner;
        /* dev->driver_data will be used instead some day.
@@ -37,7 +35,6 @@ struct video_device
         * so the switch over will be transparent for you.
         * Or use {pci|usb}_{get|set}_drvdata() directly. */
        void *priv;
-#endif
        /* for videodev.c intenal usage -- please don't touch */
        int users;                     /* video_exclusive_{open|close} ... */
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index acbfc525576d..f623a33b9abe 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -270,7 +270,6 @@ struct v4l2_timecode
 /* The above is based on SMPTE timecodes */
-#if 1
 /*
 *      M P E G   C O M P R E S S I O N   P A R A M E T E R S
 *
@@ -357,7 +356,6 @@ struct v4l2_mpeg_compression {
        /* I don't expect the above being perfect yet ;) */
        __u32                           reserved_5[8];
 };
-#endif
 struct v4l2_jpegcompression
 {
@@ -871,10 +869,8 @@ struct v4l2_streamparm
 #define VIDIOC_ENUM_FMT         _IOWR ('V',  2, struct v4l2_fmtdesc)
 #define VIDIOC_G_FMT            _IOWR ('V',  4, struct v4l2_format)
 #define VIDIOC_S_FMT            _IOWR ('V',  5, struct v4l2_format)
-#if 1 /* experimental */
 #define VIDIOC_G_MPEGCOMP       _IOR  ('V',  6, struct v4l2_mpeg_compression)
 #define VIDIOC_S_MPEGCOMP       _IOW  ('V',  7, struct v4l2_mpeg_compression)
-#endif
 #define VIDIOC_REQBUFS          _IOWR ('V',  8, struct v4l2_requestbuffers)
 #define VIDIOC_QUERYBUF         _IOWR ('V',  9, struct v4l2_buffer)
 #define VIDIOC_G_FBUF           _IOR  ('V', 10, struct v4l2_framebuffer)
diff --git a/include/media/audiochip.h b/include/media/audiochip.h
index cd831168fdc1..a7ceee9fc5e9 100644
--- a/include/media/audiochip.h
+++ b/include/media/audiochip.h
@@ -1,5 +1,4 @@
 /*
- * $Id: audiochip.h,v 1.5 2005/06/16 22:59:16 hhackmann Exp $
 */
 #ifndef AUDIOCHIP_H
diff --git a/include/media/id.h b/include/media/id.h
index 801ddef301aa..6d02c94cdc0d 100644
--- a/include/media/id.h
+++ b/include/media/id.h
@@ -1,5 +1,4 @@
 /*
- * $Id: id.h,v 1.4 2005/06/12 04:19:19 mchehab Exp $
 */
 /* FIXME: this temporarely, until these are included in linux/i2c-id.h */
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 698670547f16..01b56822df4d 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -1,5 +1,4 @@
 /*
- * $Id: ir-common.h,v 1.9 2005/05/15 19:01:26 mchehab Exp $
 *
 * some common structs and functions to handle infrared remotes via
 * input layer ...
@@ -21,11 +20,11 @@
 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include <linux/version.h>
 #include <linux/input.h>
 #define IR_TYPE_RC5     1
+#define IR_TYPE_PD      2 /* Pulse distance encoded IR */
 #define IR_TYPE_OTHER  99
 #define IR_KEYTAB_TYPE  u32
@@ -60,6 +59,7 @@ void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
 u32  ir_extract_bits(u32 data, u32 mask);
 int  ir_dump_samples(u32 *samples, int count);
 int  ir_decode_biphase(u32 *samples, int count, int low, int high);
+int  ir_decode_pulsedistance(u32 *samples, int count, int low, int high);
 /*
 * Local variables:
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 3dfb8d670eb7..2a897c3a6a9a 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -1,7 +1,6 @@
 #ifndef __SAA7146__
 #define __SAA7146__
-#include <linux/version.h>      /* for version macros */
 #include <linux/module.h>       /* for module-version */
 #include <linux/delay.h>        /* for delay-stuff */
 #include <linux/slab.h>         /* for kmalloc/kfree */
@@ -15,12 +14,7 @@
 #include <linux/vmalloc.h>      /* for vmalloc() */
 #include <linux/mm.h>           /* for vmalloc_to_page() */
-/* ugly, but necessary to build the dvb stuff under 2.4. */
+#define SAA7146_VERSION_CODE 0x000500   /* 0.5.0 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-        #include "dvb_functions.h"
-#endif
-#define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0)
 #define saa7146_write(sxy,adr,dat)    writel((dat),(sxy->mem+(adr)))
 #define saa7146_read(sxy,adr)         readl(sxy->mem+(adr))
@@ -33,13 +27,8 @@ extern unsigned int saa7146_debug;
        #define DEBUG_VARIABLE saa7146_debug
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_BASENAME),__FUNCTION__)
-#define INFO(x) { printk("%s: ",__stringify(KBUILD_BASENAME)); printk x; }
-#else
 #define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__)
 #define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; }
-#endif
 #define ERR(x) { DEBUG_PROLOG; printk x; }
diff --git a/include/media/tuner.h b/include/media/tuner.h
index eeaa15ddee85..4ad08e24a1aa 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -1,6 +1,4 @@
+/*
-/* $Id: tuner.h,v 1.45 2005/07/28 18:41:21 mchehab Exp $
- *
    tuner.h - definition for different tuners
    Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -28,88 +26,90 @@
 #define ADDR_UNSET (255)
-#define TUNER_TEMIC_PAL     0        /* 4002 FH5 (3X 7756, 9483) */
+#define TUNER_TEMIC_PAL                 0        /* 4002 FH5 (3X 7756, 9483) */
-#define TUNER_PHILIPS_PAL_I 1
+#define TUNER_PHILIPS_PAL_I             1
-#define TUNER_PHILIPS_NTSC  2
+#define TUNER_PHILIPS_NTSC              2
-#define TUNER_PHILIPS_SECAM 3           /* you must actively select B/G, L, L` */
+#define TUNER_PHILIPS_SECAM             3       /* you must actively select B/G, L, L` */
-#define TUNER_ABSENT        4
+#define TUNER_ABSENT                    4
-#define TUNER_PHILIPS_PAL   5
+#define TUNER_PHILIPS_PAL               5
-#define TUNER_TEMIC_NTSC    6        /* 4032 FY5 (3X 7004, 9498, 9789)  */
+#define TUNER_TEMIC_NTSC                6       /* 4032 FY5 (3X 7004, 9498, 9789)  */
-#define TUNER_TEMIC_PAL_I   7        /* 4062 FY5 (3X 8501, 9957)        */
+#define TUNER_TEMIC_PAL_I               7       /* 4062 FY5 (3X 8501, 9957) */
-#define TUNER_TEMIC_4036FY5_NTSC 8   /* 4036 FY5 (3X 1223, 1981, 7686)  */
+#define TUNER_TEMIC_4036FY5_NTSC        8       /* 4036 FY5 (3X 1223, 1981, 7686) */
-#define TUNER_ALPS_TSBH1_NTSC    9
+#define TUNER_ALPS_TSBH1_NTSC           9
-#define TUNER_ALPS_TSBE1_PAL    10
+#define TUNER_ALPS_TSBE1_PAL            10
-#define TUNER_ALPS_TSBB5_PAL_I  11
+#define TUNER_ALPS_TSBB5_PAL_I          11
-#define TUNER_ALPS_TSBE5_PAL    12
+#define TUNER_ALPS_TSBE5_PAL            12
-#define TUNER_ALPS_TSBC5_PAL    13
+#define TUNER_ALPS_TSBC5_PAL            13
-#define TUNER_TEMIC_4006FH5_PAL 14   /* 4006 FH5 (3X 9500, 9501, 7291)     */
+#define TUNER_TEMIC_4006FH5_PAL         14      /* 4006 FH5 (3X 9500, 9501, 7291) */
-#define TUNER_ALPS_TSHC6_NTSC   15
+#define TUNER_ALPS_TSHC6_NTSC           15
-#define TUNER_TEMIC_PAL_DK      16   /* 4016 FY5 (3X 1392, 1393)     */
+#define TUNER_TEMIC_PAL_DK              16      /* 4016 FY5 (3X 1392, 1393) */
-#define TUNER_PHILIPS_NTSC_M    17
+#define TUNER_PHILIPS_NTSC_M            17
-#define TUNER_TEMIC_4066FY5_PAL_I       18  /* 4066 FY5 (3X 7032, 7035) */
+#define TUNER_TEMIC_4066FY5_PAL_I       18      /* 4066 FY5 (3X 7032, 7035) */
-#define TUNER_TEMIC_4006FN5_MULTI_PAL   19  /* B/G, I and D/K autodetected (3X 7595, 7606, 7657)*/
+#define TUNER_TEMIC_4006FN5_MULTI_PAL   19      /* B/G, I and D/K autodetected (3X 7595, 7606, 7657) */
-#define TUNER_TEMIC_4009FR5_PAL         20  /* incl. FM radio (3X 7607, 7488, 7711)*/
+#define TUNER_TEMIC_4009FR5_PAL         20      /* incl. FM radio (3X 7607, 7488, 7711) */
-#define TUNER_TEMIC_4039FR5_NTSC        21  /* incl. FM radio (3X 7246, 7578, 7732)*/
+#define TUNER_TEMIC_4039FR5_NTSC        21      /* incl. FM radio (3X 7246, 7578, 7732) */
-#define TUNER_TEMIC_4046FM5             22  /* you must actively select B/G, D/K, I, L, L` !  (3X 7804, 7806, 8103, 8104)*/
+#define TUNER_TEMIC_4046FM5             22      /* you must actively select B/G, D/K, I, L, L` !  (3X 7804, 7806, 8103, 8104) */
 #define TUNER_PHILIPS_PAL_DK            23
-#define TUNER_PHILIPS_FQ1216ME          24  /* you must actively select B/G/D/K, I, L, L` */
+#define TUNER_PHILIPS_FQ1216ME          24      /* you must actively select B/G/D/K, I, L, L` */
-#define TUNER_LG_PAL_I_FM       25
+#define TUNER_LG_PAL_I_FM               25
-#define TUNER_LG_PAL_I          26
+#define TUNER_LG_PAL_I                  26
-#define TUNER_LG_NTSC_FM        27
+#define TUNER_LG_NTSC_FM                27
-#define TUNER_LG_PAL_FM         28
+#define TUNER_LG_PAL_FM                 28
-#define TUNER_LG_PAL            29
+#define TUNER_LG_PAL                    29
-#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM        30  /* B/G, I and D/K autodetected (3X 8155, 8160, 8163)*/
+#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30     /* B/G, I and D/K autodetected (3X 8155, 8160, 8163) */
-#define TUNER_SHARP_2U5JF5540_NTSC  31
+#define TUNER_SHARP_2U5JF5540_NTSC      31
-#define TUNER_Samsung_PAL_TCPM9091PD27 32
+#define TUNER_Samsung_PAL_TCPM9091PD27  32
-#define TUNER_MT2032 33
+#define TUNER_MT2032                    33
-#define TUNER_TEMIC_4106FH5     34      /* 4106 FH5 (3X 7808, 7865)*/
+#define TUNER_TEMIC_4106FH5             34      /* 4106 FH5 (3X 7808, 7865) */
-#define TUNER_TEMIC_4012FY5     35      /* 4012 FY5 (3X 0971, 1099)*/
+#define TUNER_TEMIC_4012FY5             35      /* 4012 FY5 (3X 0971, 1099) */
-#define TUNER_TEMIC_4136FY5     36      /* 4136 FY5 (3X 7708, 7746)*/
+#define TUNER_TEMIC_4136FY5             36      /* 4136 FY5 (3X 7708, 7746) */
-#define TUNER_LG_PAL_NEW_TAPC   37
+#define TUNER_LG_PAL_NEW_TAPC           37
-#define TUNER_PHILIPS_FM1216ME_MK3  38
+#define TUNER_PHILIPS_FM1216ME_MK3      38
-#define TUNER_LG_NTSC_NEW_TAPC   39
+#define TUNER_LG_NTSC_NEW_TAPC          39
-#define TUNER_HITACHI_NTSC       40
+#define TUNER_HITACHI_NTSC              40
-#define TUNER_PHILIPS_PAL_MK     41
+#define TUNER_PHILIPS_PAL_MK            41
-#define TUNER_PHILIPS_ATSC       42
+#define TUNER_PHILIPS_ATSC              42
-#define TUNER_PHILIPS_FM1236_MK3 43
+#define TUNER_PHILIPS_FM1236_MK3        43
-#define TUNER_PHILIPS_4IN1       44     /* ATI TV Wonder Pro - Conexant */
+#define TUNER_PHILIPS_4IN1              44      /* ATI TV Wonder Pro - Conexant */
 /* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
-#define TUNER_MICROTUNE_4049FM5  45
+#define TUNER_MICROTUNE_4049FM5         45
-#define TUNER_LG_NTSC_TAPE       47
+#define TUNER_MICROTUNE_4042_FI5        46
+#define TUNER_LG_NTSC_TAPE              47
-#define TUNER_TNF_8831BGFF       48
-#define TUNER_MICROTUNE_4042FI5  49     /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */
+#define TUNER_TNF_8831BGFF              48
-#define TUNER_TCL_2002N          50
+#define TUNER_MICROTUNE_4042FI5         49      /* DViCO FusionHDTV 3 Gold-Q - 4042 FI5 (3X 8147) */
-#define TUNER_PHILIPS_FM1256_IH3   51
+#define TUNER_TCL_2002N                 50
+#define TUNER_PHILIPS_FM1256_IH3        51
-#define TUNER_THOMSON_DTT7610    52
-#define TUNER_PHILIPS_FQ1286     53
+#define TUNER_THOMSON_DTT7610           52
-#define TUNER_PHILIPS_TDA8290    54
+#define TUNER_PHILIPS_FQ1286            53
-#define TUNER_LG_PAL_TAPE        55    /* Hauppauge PVR-150 PAL */
+#define TUNER_PHILIPS_TDA8290           54
+#define TUNER_LG_PAL_TAPE               55      /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FQ1236A_MK4   57   /* Hauppauge PVR-500MCE NTSC */
+#define TUNER_PHILIPS_FQ1216AME_MK4     56      /* Hauppauge PVR-150 PAL */
+#define TUNER_PHILIPS_FQ1236A_MK4       57      /* Hauppauge PVR-500MCE NTSC */
-#define TUNER_YMEC_TVF_8531MF 58
+#define TUNER_YMEC_TVF_8531MF           58
-#define TUNER_YMEC_TVF_5533MF 59        /* Pixelview Pro Ultra NTSC */
+#define TUNER_YMEC_TVF_5533MF           59      /* Pixelview Pro Ultra NTSC */
-#define TUNER_THOMSON_DTT7611 60        /* DViCO FusionHDTV 3 Gold-T */
-#define TUNER_TENA_9533_DI    61
+#define TUNER_THOMSON_DTT7611           60      /* DViCO FusionHDTV 3 Gold-T */
+#define TUNER_TENA_9533_DI              61
-#define TUNER_TEA5767         62        /* Only FM Radio Tuner */
+#define TUNER_TEA5767                   62      /* Only FM Radio Tuner */
-#define TUNER_PHILIPS_FMD1216ME_MK3 63
+#define TUNER_PHILIPS_FMD1216ME_MK3     63
-#define TUNER_LG_TDVS_H062F   64        /* DViCO FusionHDTV 5 */
-#define TUNER_YMEC_TVF66T5_B_DFF 65     /* Acorp Y878F */
+#define TUNER_LG_TDVS_H062F             64      /* DViCO FusionHDTV 5 */
+#define TUNER_YMEC_TVF66T5_B_DFF        65      /* Acorp Y878F */
+#define TUNER_LG_NTSC_TALN_MINI         66
 #define NOTUNER 0
 #define PAL     1       /* PAL_BG */
@@ -117,7 +117,7 @@
 #define NTSC    3
 #define SECAM   4
 #define ATSC    5
-#define RADIO   6
+#define RADIO   6
 #define NoTuner 0
 #define Philips 1
@@ -134,6 +134,7 @@
 #define THOMSON 12
 #define TUNER_SET_TYPE_ADDR          _IOW('T',3,int)
+#define TUNER_SET_STANDBY            _IOW('T',4,int)
 #define TDA9887_SET_CONFIG           _IOW('t',5,int)
 /* tv card specific */
@@ -153,9 +154,6 @@
 #ifdef __KERNEL__
-#define I2C_ADDR_TDA8290        0x4b
-#define I2C_ADDR_TDA8275        0x61
 enum tuner_mode {
        T_UNINITIALIZED = 0,
        T_RADIO         = 1 << V4L2_TUNER_RADIO,
@@ -165,21 +163,21 @@ enum tuner_mode {
 };
 struct tuner_setup {
-        unsigned short          addr;
+        unsigned short  addr;
-        unsigned int            type;
+        unsigned int    type;
-        unsigned int            mode_mask;
+        unsigned int    mode_mask;
 };
 struct tuner {
        /* device */
        struct i2c_client i2c;
-        unsigned int type;            /* chip type */
+        unsigned int type;      /* chip type */
-        unsigned int          mode;
+        unsigned int mode;
-        unsigned int          mode_mask; /* Combination of allowable modes */
+        unsigned int mode_mask; /* Combination of allowable modes */
-        unsigned int freq;            /* keep track of the current settings */
+        unsigned int freq;      /* keep track of the current settings */
        unsigned int audmode;
        v4l2_std_id  std;
@@ -198,6 +196,7 @@ struct tuner {
        void (*radio_freq)(struct i2c_client *c, unsigned int freq);
        int  (*has_signal)(struct i2c_client *c);
        int  (*is_stereo)(struct i2c_client *c);
+        void (*standby)(struct i2c_client *c);
 };
 extern unsigned int tuner_debug;
@@ -209,16 +208,20 @@ extern int tea5767_tuner_init(struct i2c_client *c);
 extern int default_tuner_init(struct i2c_client *c);
 extern int tea5767_autodetection(struct i2c_client *c);
-#define tuner_warn(fmt, arg...) \
+#define tuner_warn(fmt, arg...) do {\
-        dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg)
+        printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \
-#define tuner_info(fmt, arg...) \
+                        t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
-        dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg)
+#define tuner_info(fmt, arg...) do {\
-#define tuner_dbg(fmt, arg...) \
+        printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \
-        if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg)
+                        t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
+#define tuner_dbg(fmt, arg...) do {\
+        if (tuner_debug) \
+                printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \
+                        t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
 #endif /* __KERNEL__ */
-#endif
+#endif /* _TUNER_H */
 /*
 * Overrides for Emacs so that we follow Linus's tabbing style.
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index 854a2c2f105b..e2035c7da094 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -1,18 +1,21 @@
 /*
- * $Id: tveeprom.h,v 1.2 2005/06/12 04:19:19 mchehab Exp $
 */
 struct tveeprom {
        u32 has_radio;
+        u32 has_ir;     /* 0: no IR, 1: IR present, 2: unknown */
        u32 tuner_type;
        u32 tuner_formats;
+        u32 tuner2_type;
+        u32 tuner2_formats;
        u32 digitizer;
        u32 digitizer_formats;
        u32 audio_processor;
-        /* a_p_fmts? */
+        u32 decoder_processor;
        u32 model;
        u32 revision;
@@ -20,7 +23,7 @@ struct tveeprom {
        char rev_str[5];
 };
-void tveeprom_hauppauge_analog(struct tveeprom *tvee,
+void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                               unsigned char *eeprom_data);
 int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len);
diff --git a/include/media/video-buf.h b/include/media/video-buf.h
index ae6da6de98de..ae8d7a000440 100644
--- a/include/media/video-buf.h
+++ b/include/media/video-buf.h
@@ -1,5 +1,4 @@
 /*
- * $Id: video-buf.h,v 1.9 2004/11/07 13:17:15 kraxel Exp $
 *
 * generic helper functions for video4linux capture buffers, to handle
 * memory management and PCI DMA.  Right now bttv + saa7134 use it.
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index b707a603351b..cb8b6e6ce66c 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -151,6 +151,8 @@ struct pcmcia_device {
           uniquely define a pcmcia_device */
        struct pcmcia_socket    *socket;
+        char                    *devname;
        u8                      device_no;
        /* the hardware "function" device; certain subdevices can
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 389e8ebe9c19..d6361dab0370 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -910,11 +910,10 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format);
 * Returns 1 if the given PCM format is CPU-endian, 0 if
 * opposite, or a negative error code if endian not specified.
 */
-/* int snd_pcm_format_cpu_endian(snd_pcm_format_t format); */
 #ifdef SNDRV_LITTLE_ENDIAN
-#define snd_pcm_format_cpu_endian       snd_pcm_format_little_endian
+#define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format)
 #else
-#define snd_pcm_format_cpu_endian       snd_pcm_format_big_endian
+#define snd_pcm_format_cpu_endian(format) snd_pcm_format_big_endian(format)
 #endif
 int snd_pcm_format_width(snd_pcm_format_t format);                      /* in bits */
 int snd_pcm_format_physical_width(snd_pcm_format_t format);             /* in bits */
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index ad3c3be33c03..b82e408e758f 100644
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -34,9 +34,7 @@ struct snd_tea575x_ops {
 struct snd_tea575x {
        snd_card_t *card;
        struct video_device vd;         /* video device */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)
        struct file_operations fops;
-#endif
        int dev_nr;                     /* requested device number + 1 */
        int vd_registered;              /* video device is registered */
        int tea5759;                    /* 5759 chip is present */
diff --git a/include/video/cyblafb.h b/include/video/cyblafb.h
new file mode 100644
index 000000000000..a9948232b131
--- /dev/null
+++ b/include/video/cyblafb.h
@@ -0,0 +1,171 @@
+#ifndef CYBLAFB_DEBUG
+#define CYBLAFB_DEBUG 0
+#endif
+#if CYBLAFB_DEBUG
+#define debug(f,a...)   printk("%s:" f,  __FUNCTION__ , ## a);
+#else
+#define debug(f,a...)
+#endif
+#define output(f, a...) printk("cyblafb: " f, ## a)
+#define Kb      (1024)
+#define Mb      (Kb*Kb)
+/* PCI IDS of supported cards temporarily here */
+#define CYBERBLADEi1    0x8500
+/* these defines are for 'lcd' variable */
+#define LCD_STRETCH     0
+#define LCD_CENTER      1
+#define LCD_BIOS        2
+/* display types */
+#define DISPLAY_CRT     0
+#define DISPLAY_FP      1
+#define ROP_S   0xCC
+#define point(x,y) ((y)<<16|(x))
+//
+// Attribute Regs, ARxx, 3c0/3c1
+//
+#define AR00    0x00
+#define AR01    0x01
+#define AR02    0x02
+#define AR03    0x03
+#define AR04    0x04
+#define AR05    0x05
+#define AR06    0x06
+#define AR07    0x07
+#define AR08    0x08
+#define AR09    0x09
+#define AR0A    0x0A
+#define AR0B    0x0B
+#define AR0C    0x0C
+#define AR0D    0x0D
+#define AR0E    0x0E
+#define AR0F    0x0F
+#define AR10    0x10
+#define AR12    0x12
+#define AR13    0x13
+//
+// Sequencer Regs, SRxx, 3c4/3c5
+//
+#define SR00    0x00
+#define SR01    0x01
+#define SR02    0x02
+#define SR03    0x03
+#define SR04    0x04
+#define SR0D    0x0D
+#define SR0E    0x0E
+#define SR11    0x11
+#define SR18    0x18
+#define SR19    0x19
+//
+//
+//
+#define CR00    0x00
+#define CR01    0x01
+#define CR02    0x02
+#define CR03    0x03
+#define CR04    0x04
+#define CR05    0x05
+#define CR06    0x06
+#define CR07    0x07
+#define CR08    0x08
+#define CR09    0x09
+#define CR0A    0x0A
+#define CR0B    0x0B
+#define CR0C    0x0C
+#define CR0D    0x0D
+#define CR0E    0x0E
+#define CR0F    0x0F
+#define CR10    0x10
+#define CR11    0x11
+#define CR12    0x12
+#define CR13    0x13
+#define CR14    0x14
+#define CR15    0x15
+#define CR16    0x16
+#define CR17    0x17
+#define CR18    0x18
+#define CR19    0x19
+#define CR1A    0x1A
+#define CR1B    0x1B
+#define CR1C    0x1C
+#define CR1D    0x1D
+#define CR1E    0x1E
+#define CR1F    0x1F
+#define CR20    0x20
+#define CR21    0x21
+#define CR27    0x27
+#define CR29    0x29
+#define CR2A    0x2A
+#define CR2B    0x2B
+#define CR2D    0x2D
+#define CR2F    0x2F
+#define CR36    0x36
+#define CR38    0x38
+#define CR39    0x39
+#define CR3A    0x3A
+#define CR55    0x55
+#define CR56    0x56
+#define CR57    0x57
+#define CR58    0x58
+//
+//
+//
+#define GR00    0x01
+#define GR01    0x01
+#define GR02    0x02
+#define GR03    0x03
+#define GR04    0x04
+#define GR05    0x05
+#define GR06    0x06
+#define GR07    0x07
+#define GR08    0x08
+#define GR0F    0x0F
+#define GR20    0x20
+#define GR23    0x23
+#define GR2F    0x2F
+#define GR30    0x30
+#define GR31    0x31
+#define GR33    0x33
+#define GR52    0x52
+#define GR53    0x53
+#define GR5D    0x5d
+//
+// Graphics Engine
+//
+#define GEBase  0x2100          // could be mapped elsewhere if we like it
+#define GE00    (GEBase+0x00)   // source 1, p 111
+#define GE04    (GEBase+0x04)   // source 2, p 111
+#define GE08    (GEBase+0x08)   // destination 1, p 111
+#define GE0C    (GEBase+0x0C)   // destination 2, p 112
+#define GE20    (GEBase+0x20)   // engine status, p 113
+#define GE24    (GEBase+0x24)   // reset all GE pointers
+#define GE44    (GEBase+0x44)   // command register, p 126
+#define GE48    (GEBase+0x48)   // raster operation, p 127
+#define GE60    (GEBase+0x60)   // foreground color, p 128
+#define GE64    (GEBase+0x64)   // background color, p 128
+#define GE6C    (GEBase+0x6C)   // Pattern and Style, p 129, ok
+#define GE9C    (GEBase+0x9C)   // pixel engine data port, p 125
+#define GEB8    (GEBase+0xB8)   // Destination Stride / Buffer Base 0, p 133
+#define GEBC    (GEBase+0xBC)   // Destination Stride / Buffer Base 1, p 133
+#define GEC0    (GEBase+0xC0)   // Destination Stride / Buffer Base 2, p 133
+#define GEC4    (GEBase+0xC4)   // Destination Stride / Buffer Base 3, p 133
+#define GEC8    (GEBase+0xC8)   // Source Stride / Buffer Base 0, p 133
+#define GECC    (GEBase+0xCC)   // Source Stride / Buffer Base 1, p 133
+#define GED0    (GEBase+0xD0)   // Source Stride / Buffer Base 2, p 133
+#define GED4    (GEBase+0xD4)   // Source Stride / Buffer Base 3, p 133
diff --git a/include/video/sisfb.h b/include/video/sisfb.h
index 136bf791643d..e402eb5b3c7a 100644
--- a/include/video/sisfb.h
+++ b/include/video/sisfb.h
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2001-2004 by Thomas Winischhofer, Vienna, Austria.
+ * sisfb.h - definitions for the SiS framebuffer driver
+ *
+ * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -16,8 +18,8 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
 */
-#ifndef _LINUX_SISFB
+#ifndef _LINUX_SISFB_H_
-#define _LINUX_SISFB
+#define _LINUX_SISFB_H_
 #include <asm/ioctl.h>
 #include <asm/types.h>
@@ -26,47 +28,35 @@
 /*                   PUBLIC                   */
 /**********************************************/
-/* vbflags */
+/* vbflags, public (others in sis.h) */
-#define CRT2_DEFAULT            0x00000001
+#define CRT2_DEFAULT            0x00000001
-#define CRT2_LCD                0x00000002  /* TW: Never change the order of the CRT2_XXX entries */
+#define CRT2_LCD                0x00000002
-#define CRT2_TV                 0x00000004  /*     (see SISCycleCRT2Type())                       */
+#define CRT2_TV                 0x00000004
-#define CRT2_VGA                0x00000008
+#define CRT2_VGA                0x00000008
-#define TV_NTSC                 0x00000010
+#define TV_NTSC                 0x00000010
-#define TV_PAL                  0x00000020
+#define TV_PAL                  0x00000020
-#define TV_HIVISION             0x00000040
+#define TV_HIVISION             0x00000040
-#define TV_YPBPR                0x00000080
+#define TV_YPBPR                0x00000080
-#define TV_AVIDEO               0x00000100
+#define TV_AVIDEO               0x00000100
-#define TV_SVIDEO               0x00000200
+#define TV_SVIDEO               0x00000200
-#define TV_SCART                0x00000400
+#define TV_SCART                0x00000400
-#define VB_CONEXANT             0x00000800      /* 661 series only */
+#define TV_PALM                 0x00001000
-#define VB_TRUMPION             VB_CONEXANT     /* 300 series only */
+#define TV_PALN                 0x00002000
-#define TV_PALM                 0x00001000
-#define TV_PALN                 0x00002000
 #define TV_NTSCJ                0x00001000
-#define VB_302ELV               0x00004000
+#define TV_CHSCART              0x00008000
-#define TV_CHSCART              0x00008000
+#define TV_CHYPBPR525I          0x00010000
-#define TV_CHYPBPR525I          0x00010000
 #define CRT1_VGA                0x00000000
 #define CRT1_LCDA               0x00020000
 #define VGA2_CONNECTED          0x00040000
-#define VB_DISPTYPE_CRT1        0x00080000      /* CRT1 connected and used */
+#define VB_DISPTYPE_CRT1        0x00080000      /* CRT1 connected and used */
-#define VB_301                  0x00100000      /* Video bridge type */
+#define VB_SINGLE_MODE          0x20000000      /* CRT1 or CRT2; determined by DISPTYPE_CRTx */
-#define VB_301B                 0x00200000
+#define VB_MIRROR_MODE          0x40000000      /* CRT1 + CRT2 identical (mirror mode) */
-#define VB_302B                 0x00400000
+#define VB_DUALVIEW_MODE        0x80000000      /* CRT1 + CRT2 independent (dual head mode) */
-#define VB_30xBDH               0x00800000      /* 30xB DH version (w/o LCD support) */
-#define VB_LVDS                 0x01000000
-#define VB_CHRONTEL             0x02000000
-#define VB_301LV                0x04000000
-#define VB_302LV                0x08000000
-#define VB_301C                 0x10000000
-#define VB_SINGLE_MODE          0x20000000      /* CRT1 or CRT2; determined by DISPTYPE_CRTx */
-#define VB_MIRROR_MODE          0x40000000      /* CRT1 + CRT2 identical (mirror mode) */
-#define VB_DUALVIEW_MODE        0x80000000      /* CRT1 + CRT2 independent (dual head mode) */
 /* Aliases: */
 #define CRT2_ENABLE             (CRT2_LCD | CRT2_TV | CRT2_VGA)
-#define TV_STANDARD             (TV_NTSC | TV_PAL | TV_PALM | TV_PALN | TV_NTSCJ)
+#define TV_STANDARD             (TV_NTSC | TV_PAL | TV_PALM | TV_PALN | TV_NTSCJ)
-#define TV_INTERFACE            (TV_AVIDEO|TV_SVIDEO|TV_SCART|TV_HIVISION|TV_YPBPR|TV_CHSCART|TV_CHYPBPR525I)
+#define TV_INTERFACE            (TV_AVIDEO|TV_SVIDEO|TV_SCART|TV_HIVISION|TV_YPBPR|TV_CHSCART|TV_CHYPBPR525I)
 /* Only if TV_YPBPR is set: */
 #define TV_YPBPR525I            TV_NTSC
@@ -75,89 +65,118 @@
 #define TV_YPBPR1080I           TV_PALN
 #define TV_YPBPRALL             (TV_YPBPR525I | TV_YPBPR525P | TV_YPBPR750P | TV_YPBPR1080I)
-#define VB_SISBRIDGE            (VB_301|VB_301B|VB_301C|VB_302B|VB_301LV|VB_302LV|VB_302ELV)
-#define VB_SISTVBRIDGE          (VB_301|VB_301B|VB_301C|VB_302B|VB_301LV|VB_302LV)
-#define VB_VIDEOBRIDGE          (VB_SISBRIDGE | VB_LVDS | VB_CHRONTEL | VB_CONEXANT)
 #define VB_DISPTYPE_DISP2       CRT2_ENABLE
 #define VB_DISPTYPE_CRT2        CRT2_ENABLE
 #define VB_DISPTYPE_DISP1       VB_DISPTYPE_CRT1
 #define VB_DISPMODE_SINGLE      VB_SINGLE_MODE
 #define VB_DISPMODE_MIRROR      VB_MIRROR_MODE
 #define VB_DISPMODE_DUAL        VB_DUALVIEW_MODE
-#define VB_DISPLAY_MODE         (SINGLE_MODE | MIRROR_MODE | DUALVIEW_MODE)
+#define VB_DISPLAY_MODE         (SINGLE_MODE | MIRROR_MODE | DUALVIEW_MODE)
 /* Structure argument for SISFB_GET_INFO ioctl  */
-typedef struct _SISFB_INFO sisfb_info, *psisfb_info;
+struct sisfb_info {
+        __u32   sisfb_id;               /* for identifying sisfb */
-struct _SISFB_INFO {
-        __u32   sisfb_id;               /* for identifying sisfb */
 #ifndef SISFB_ID
 #define SISFB_ID          0x53495346    /* Identify myself with 'SISF' */
 #endif
-        __u32   chip_id;                /* PCI-ID of detected chip */
+        __u32   chip_id;                /* PCI-ID of detected chip */
-        __u32   memory;                 /* video memory in KB which sisfb manages */
+        __u32   memory;                 /* total video memory in KB */
-        __u32   heapstart;              /* heap start (= sisfb "mem" argument) in KB */
+        __u32   heapstart;              /* heap start offset in KB */
        __u8    fbvidmode;              /* current sisfb mode */
-        __u8    sisfb_version;
+        __u8    sisfb_version;
-        __u8    sisfb_revision;
+        __u8    sisfb_revision;
-        __u8    sisfb_patchlevel;
+        __u8    sisfb_patchlevel;
-        __u8    sisfb_caps;             /* sisfb capabilities */
+        __u8    sisfb_caps;             /* sisfb capabilities */
        __u32   sisfb_tqlen;            /* turbo queue length (in KB) */
-        __u32   sisfb_pcibus;           /* The card's PCI ID */
+        __u32   sisfb_pcibus;           /* The card's PCI ID */
-        __u32   sisfb_pcislot;
+        __u32   sisfb_pcislot;
-        __u32   sisfb_pcifunc;
+        __u32   sisfb_pcifunc;
+        __u8    sisfb_lcdpdc;           /* PanelDelayCompensation */
+        __u8    sisfb_lcda;             /* Detected status of LCDA for low res/text modes */
+        __u32   sisfb_vbflags;
+        __u32   sisfb_currentvbflags;
+        __u32   sisfb_scalelcd;
+        __u32   sisfb_specialtiming;
+        __u8    sisfb_haveemi;
+        __u8    sisfb_emi30,sisfb_emi31,sisfb_emi32,sisfb_emi33;
+        __u8    sisfb_haveemilcd;
-        __u8    sisfb_lcdpdc;           /* PanelDelayCompensation */
+        __u8    sisfb_lcdpdca;          /* PanelDelayCompensation for LCD-via-CRT1 */
-        __u8    sisfb_lcda;             /* Detected status of LCDA for low res/text modes */
+        __u16   sisfb_tvxpos, sisfb_tvypos;     /* Warning: Values + 32 ! */
-        __u32   sisfb_vbflags;
+        __u32   sisfb_heapsize;         /* heap size (in KB) */
-        __u32   sisfb_currentvbflags;
+        __u32   sisfb_videooffset;      /* Offset of viewport in video memory (in bytes) */
-        __u32   sisfb_scalelcd;
+        __u32   sisfb_curfstn;          /* currently running FSTN/DSTN mode */
-        __u32   sisfb_specialtiming;
+        __u32   sisfb_curdstn;
-        __u8    sisfb_haveemi;
+        __u16   sisfb_pci_vendor;       /* PCI vendor (SiS or XGI) */
-        __u8    sisfb_emi30,sisfb_emi31,sisfb_emi32,sisfb_emi33;
-        __u8    sisfb_haveemilcd;
-        __u8    sisfb_lcdpdca;          /* PanelDelayCompensation for LCD-via-CRT1 */
+        __u32   sisfb_vbflags2;         /* ivideo->vbflags2 */
-        __u16   sisfb_tvxpos, sisfb_tvypos;  /* Warning: Values + 32 ! */
+        __u8    sisfb_can_post;         /* sisfb can POST this card */
+        __u8    sisfb_card_posted;      /* card is POSTED */
+        __u8    sisfb_was_boot_device;  /* This card was the boot video device (ie is primary) */
-        __u8    reserved[208];          /* for future use */
+        __u8    reserved[183];          /* for future use */
+};
+#define SISFB_CMD_GETVBFLAGS    0x55AA0001      /* no arg; result[1] = vbflags */
+#define SISFB_CMD_SWITCHCRT1    0x55AA0010      /* arg[0]: 99 = query, 0 = off, 1 = on */
+/* more to come */
+#define SISFB_CMD_ERR_OK        0x80000000      /* command succeeded */
+#define SISFB_CMD_ERR_LOCKED    0x80000001      /* sisfb is locked */
+#define SISFB_CMD_ERR_EARLY     0x80000002      /* request before sisfb took over gfx system */
+#define SISFB_CMD_ERR_NOVB      0x80000003      /* No video bridge */
+#define SISFB_CMD_ERR_NOCRT2    0x80000004      /* can't change CRT1 status, CRT2 disabled */
+/* more to come */
+#define SISFB_CMD_ERR_UNKNOWN   0x8000ffff      /* Unknown command */
+#define SISFB_CMD_ERR_OTHER     0x80010000      /* Other error */
+/* Argument for SISFB_CMD ioctl */
+struct sisfb_cmd {
+        __u32  sisfb_cmd;
+        __u32  sisfb_arg[16];
+        __u32  sisfb_result[4];
 };
 /* Addtional IOCTLs for communication sisfb <> X driver                */
 /* If changing this, vgatypes.h must also be changed (for X driver)    */
 /* ioctl for identifying and giving some info (esp. memory heap start) */
-#define SISFB_GET_INFO_SIZE     _IOR(0xF3,0x00,__u32)
+#define SISFB_GET_INFO_SIZE     _IOR(0xF3,0x00,__u32)
-#define SISFB_GET_INFO          _IOR(0xF3,0x01,struct _SISFB_INFO)
+#define SISFB_GET_INFO          _IOR(0xF3,0x01,struct sisfb_info)
 /* ioctrl to get current vertical retrace status */
-#define SISFB_GET_VBRSTATUS     _IOR(0xF3,0x02,__u32)
+#define SISFB_GET_VBRSTATUS     _IOR(0xF3,0x02,__u32)
 /* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
-#define SISFB_GET_AUTOMAXIMIZE  _IOR(0xF3,0x03,__u32)
+#define SISFB_GET_AUTOMAXIMIZE  _IOR(0xF3,0x03,__u32)
-#define SISFB_SET_AUTOMAXIMIZE  _IOW(0xF3,0x03,__u32)
+#define SISFB_SET_AUTOMAXIMIZE  _IOW(0xF3,0x03,__u32)
 /* ioctls to relocate TV output (x=D[31:16], y=D[15:0], + 32)*/
-#define SISFB_GET_TVPOSOFFSET   _IOR(0xF3,0x04,__u32)
+#define SISFB_GET_TVPOSOFFSET   _IOR(0xF3,0x04,__u32)
-#define SISFB_SET_TVPOSOFFSET   _IOW(0xF3,0x04,__u32)
+#define SISFB_SET_TVPOSOFFSET   _IOW(0xF3,0x04,__u32)
+/* ioctl for internal sisfb commands (sisfbctrl) */
+#define SISFB_COMMAND           _IOWR(0xF3,0x05,struct sisfb_cmd)
 /* ioctl for locking sisfb (no register access during lock) */
 /* As of now, only used to avoid register access during
 * the ioctls listed above.
 */
-#define SISFB_SET_LOCK          _IOW(0xF3,0x06,__u32)
+#define SISFB_SET_LOCK          _IOW(0xF3,0x06,__u32)
-/* more to come soon */
 /* ioctls 0xF3 up to 0x3F reserved for sisfb */
@@ -165,7 +184,7 @@ struct _SISFB_INFO {
 /* The following are deprecated and should not be used anymore: */
 /****************************************************************/
 /* ioctl for identifying and giving some info (esp. memory heap start) */
-#define SISFB_GET_INFO_OLD         _IOR('n',0xF8,__u32)
+#define SISFB_GET_INFO_OLD         _IOR('n',0xF8,__u32)
 /* ioctrl to get current vertical retrace status */
 #define SISFB_GET_VBRSTATUS_OLD    _IOR('n',0xF9,__u32)
 /* ioctl to enable/disable panning auto-maximize (like nomax parameter) */
@@ -177,8 +196,8 @@ struct _SISFB_INFO {
 /* For fb memory manager (FBIO_ALLOC, FBIO_FREE) */
 struct sis_memreq {
-        __u32   offset;
+        __u32   offset;
-        __u32   size;
+        __u32   size;
 };
 /**********************************************/
@@ -187,12 +206,19 @@ struct sis_memreq {
 /**********************************************/
 #ifdef __KERNEL__
+#include <linux/pci.h>
 #define UNKNOWN_VGA  0
 #define SIS_300_VGA  1
 #define SIS_315_VGA  2
+#define SISFB_HAVE_MALLOC_NEW
 extern void sis_malloc(struct sis_memreq *req);
+extern void sis_malloc_new(struct pci_dev *pdev, struct sis_memreq *req);
 extern void sis_free(u32 base);
+extern void sis_free_new(struct pci_dev *pdev, u32 base);
 #endif
 #endif