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

« back to all changes in this revision

Viewing changes to arch/powerpc/kernel/cputable.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
[ 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:
1811
1811
                .machine_check          = machine_check_440A,
1812
1812
                .platform               = "ppc440",
1813
1813
        },
1814
 
        { /* 476 core */
1815
 
                .pvr_mask               = 0xffff0000,
1816
 
                .pvr_value              = 0x11a50000,
 
1814
        { /* 476 DD2 core */
 
1815
                .pvr_mask               = 0xffffffff,
 
1816
                .pvr_value              = 0x11a52080,
1817
1817
                .cpu_name               = "476",
1818
 
                .cpu_features           = CPU_FTRS_47X,
 
1818
                .cpu_features           = CPU_FTRS_47X | CPU_FTR_476_DD2,
1819
1819
                .cpu_user_features      = COMMON_USER_BOOKE |
1820
1820
                        PPC_FEATURE_HAS_FPU,
1821
1821
                .mmu_features           = MMU_FTR_TYPE_47x |
1839
1839
                .machine_check          = machine_check_47x,
1840
1840
                .platform               = "ppc470",
1841
1841
        },
 
1842
        { /* 476 others */
 
1843
                .pvr_mask               = 0xffff0000,
 
1844
                .pvr_value              = 0x11a50000,
 
1845
                .cpu_name               = "476",
 
1846
                .cpu_features           = CPU_FTRS_47X,
 
1847
                .cpu_user_features      = COMMON_USER_BOOKE |
 
1848
                        PPC_FEATURE_HAS_FPU,
 
1849
                .mmu_features           = MMU_FTR_TYPE_47x |
 
1850
                        MMU_FTR_USE_TLBIVAX_BCAST | MMU_FTR_LOCK_BCAST_INVAL,
 
1851
                .icache_bsize           = 32,
 
1852
                .dcache_bsize           = 128,
 
1853
                .machine_check          = machine_check_47x,
 
1854
                .platform               = "ppc470",
 
1855
        },
1842
1856
        {       /* default match */
1843
1857
                .pvr_mask               = 0x00000000,
1844
1858
                .pvr_value              = 0x00000000,
1959
1973
                .pvr_mask               = 0xffff0000,
1960
1974
                .pvr_value              = 0x80240000,
1961
1975
                .cpu_name               = "e5500",
1962
 
                .cpu_features           = CPU_FTRS_E500MC,
 
1976
                .cpu_features           = CPU_FTRS_E5500,
1963
1977
                .cpu_user_features      = COMMON_USER_BOOKE,
1964
1978
                .mmu_features           = MMU_FTR_TYPE_FSL_E | MMU_FTR_BIG_PHYS |
1965
1979
                        MMU_FTR_USE_TLBILX,