← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/ttm/ttm_bo.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/ttm/ttm_bo.c
406
406
                }
407
407
 
408
408
                if (bo->mem.mem_type == TTM_PL_SYSTEM) {
 
409
                        if (bdev->driver->move_notify)
 
410
                                bdev->driver->move_notify(bo, mem);
409
411
                        bo->mem = *mem;
410
412
                        mem->mm_node = NULL;
411
413
                        goto moved;
412
414
                }
413
 
 
414
415
        }
415
416
 
416
417
        if (bdev->driver->move_notify)
1167
1168
                uint32_t page_alignment,
1168
1169
                unsigned long buffer_start,
1169
1170
                bool interruptible,
1170
 
                struct file *persistant_swap_storage,
 
1171
                struct file *persistent_swap_storage,
1171
1172
                size_t acc_size,
1172
1173
                void (*destroy) (struct ttm_buffer_object *))
1173
1174
{
1210
1211
        bo->priv_flags = 0;
1211
1212
        bo->mem.placement = (TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED);
1212
1213
        bo->seq_valid = false;
1213
 
        bo->persistant_swap_storage = persistant_swap_storage;
 
1214
        bo->persistent_swap_storage = persistent_swap_storage;
1214
1215
        bo->acc_size = acc_size;
1215
1216
        atomic_inc(&bo->glob->bo_count);
1216
1217
 
1259
1260
                        uint32_t page_alignment,
1260
1261
                        unsigned long buffer_start,
1261
1262
                        bool interruptible,
1262
 
                        struct file *persistant_swap_storage,
 
1263
                        struct file *persistent_swap_storage,
1263
1264
                        struct ttm_buffer_object **p_bo)
1264
1265
{
1265
1266
        struct ttm_buffer_object *bo;
1281
1282
 
1282
1283
        ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,
1283
1284
                                buffer_start, interruptible,
1284
 
                                persistant_swap_storage, acc_size, NULL);
 
1285
                                persistent_swap_storage, acc_size, NULL);
1285
1286
        if (likely(ret == 0))
1286
1287
                *p_bo = bo;
1287
1288
 
1862
1863
        if (bo->bdev->driver->swap_notify)
1863
1864
                bo->bdev->driver->swap_notify(bo);
1864
1865
 
1865
 
        ret = ttm_tt_swapout(bo->ttm, bo->persistant_swap_storage);
 
1866
        ret = ttm_tt_swapout(bo->ttm, bo->persistent_swap_storage);
1866
1867
out:
1867
1868
 
1868
1869
        /**