Merge commit 'v2.6.27-rc1' into x86/core

Conflicts:

	include/asm-x86/dma-mapping.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 739b3ab7bcc..ddccc074a76 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -581,12 +581,12 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         if (file == ppp->owner)
                                 ppp_shutdown_interface(ppp);
                 }
-                if (atomic_read(&file->f_count) <= 2) {
+                if (atomic_long_read(&file->f_count) <= 2) {
                         ppp_release(NULL, file);
                         err = 0;
                 } else
-                        printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%d\n",
-                               atomic_read(&file->f_count));
+                        printk(KERN_DEBUG "PPPIOCDETACH file->f_count=%ld\n",
+                               atomic_long_read(&file->f_count));
                 unlock_kernel();
                 return err;
         }