← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/blackfin/include/asm/uaccess.h

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/blackfin/include/asm/uaccess.h
195
195
copy_from_user(void *to, const void __user *from, unsigned long n)
196
196
{
197
197
        if (access_ok(VERIFY_READ, from, n))
198
 
                memcpy(to, from, n);
 
198
                memcpy(to, (const void __force *)from, n);
199
199
        else
200
200
                return n;
201
201
        return 0;
202
202
}
203
203
 
204
204
static inline unsigned long __must_check
205
 
copy_to_user(void *to, const void __user *from, unsigned long n)
 
205
copy_to_user(void __user *to, const void *from, unsigned long n)
206
206
{
207
207
        if (access_ok(VERIFY_WRITE, to, n))
208
 
                memcpy(to, from, n);
 
208
                memcpy((void __force *)to, from, n);
209
209
        else
210
210
                return n;
211
211
        return 0;