diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-08-04 08:52:50 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-08-04 08:52:50 -0700 |
| commit | 38e14a7cf1f5ecc1fadf2d8814bca07095786551 (patch) | |
| tree | 42ae5b9af272337ff5b261ad728bb754f60b106a /arch | |
| parent | 13a1e6e1a5adedeafbd09b1f5fa8f0ef837d5d3e (diff) | |
| parent | a95f9ac27105eba8b529a36d03af4f527aabec94 (diff) | |
| download | linux-stable-38e14a7cf1f5ecc1fadf2d8814bca07095786551.tar.gz linux-stable-38e14a7cf1f5ecc1fadf2d8814bca07095786551.tar.bz2 linux-stable-38e14a7cf1f5ecc1fadf2d8814bca07095786551.zip | |
Pull percpu256K into release branch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/page.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/perf_event_fsl_emb.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h index 5f271bc712ee..41b6d31110fd 100644 --- a/arch/ia64/include/asm/page.h +++ b/arch/ia64/include/asm/page.h @@ -41,7 +41,7 @@ #define PAGE_SIZE (__IA64_UL_CONST(1) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE - 1)) -#define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */ +#define PERCPU_PAGE_SHIFT 18 /* log2() of max. size of per-CPU area */ #define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT) diff --git a/arch/powerpc/kernel/perf_event_fsl_emb.c b/arch/powerpc/kernel/perf_event_fsl_emb.c index 369872f6cf78..babcceecd2ea 100644 --- a/arch/powerpc/kernel/perf_event_fsl_emb.c +++ b/arch/powerpc/kernel/perf_event_fsl_emb.c @@ -566,9 +566,9 @@ static void record_and_restart(struct perf_event *event, unsigned long val, * Finally record data if requested. */ if (record) { - struct perf_sample_data data = { - .period = event->hw.last_period, - }; + struct perf_sample_data data; + + perf_sample_data_init(&data, 0); if (perf_event_overflow(event, nmi, &data, regs)) { /* |