← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/mips/include/asm/cpu-info.h

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/mips/include/asm/cpu-info.h
58
58
        struct cache_desc       tcache; /* Tertiary/split secondary cache */
59
59
        int                     srsets; /* Shadow register sets */
60
60
        int                     core;   /* physical core number */
 
61
#ifdef CONFIG_64BIT
 
62
        int                     vmbits; /* Virtual memory size in bits */
 
63
#endif
61
64
#if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC)
62
65
        /*
63
66
         * In the MIPS MT "SMTC" model, each TC is considered
75
78
        unsigned int            watch_reg_use_cnt; /* Usable by ptrace */
76
79
#define NUM_WATCH_REGS 4
77
80
        u16                     watch_reg_masks[NUM_WATCH_REGS];
 
81
        unsigned int            kscratch_mask; /* Usable KScratch mask. */
78
82
} __attribute__((aligned(SMP_CACHE_BYTES)));
79
83
 
80
84
extern struct cpuinfo_mips cpu_data[];