← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to arch/sparc/kernel/perf_event.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-22.34
  • Date: 2013-01-11 15:02:20 UTC
  • mfrom: (72.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130111150220-kgmbtlwhyc4kwqhg
Tags: 3.5.0-217.25
https://launchpad.net/bugs/1097912
https://launchpad.net/bugs/1097343
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
* Release Tracking Bug
  - LP: #1097912

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-22.34

[ Ubuntu: 3.5.0-22.34 ]

* Release Tracking Bug
  - LP: #1097343
* Revert "SAUCE: fsnotify: dont put marks on temporary list when clearing
  marks by group"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce locked versions of
  fsnotify_add_mark() and fsnotify_remove_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: pass group to fsnotify_destroy_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use a mutex instead of a spinlock to protect a
  groups mark list"
  - LP: #1096137
* Revert "SAUCE: fanotify: add an extra flag to mark_remove_from_mask
  that indicates wheather a mark should be destroyed"
  - LP: #1096137
* Revert "SAUCE: fsnotify: take groups mark_lock before mark lock"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use reference counting for groups"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce fsnotify_get_group()"
  - LP: #1096137
* fsnotify: introduce fsnotify_get_group()
  - LP: #1096137
* fsnotify: use reference counting for groups
  - LP: #1096137
* fsnotify: take groups mark_lock before mark lock
  - LP: #1096137
* fanotify: add an extra flag to mark_remove_from_mask that indicates
  wheather a mark should be destroyed
  - LP: #1096137
* fsnotify: use a mutex instead of a spinlock to protect a groups mark
  list
  - LP: #1096137
* fsnotify: pass group to fsnotify_destroy_mark()
  - LP: #1096137
* fsnotify: introduce locked versions of fsnotify_add_mark() and
  fsnotify_remove_mark()
  - LP: #1096137
* fsnotify: dont put marks on temporary list when clearing marks by group
  - LP: #1096137
* fsnotify: change locking order
  - LP: #1096137

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/sparc/kernel/perf_event.c
557
557
 
558
558
static inline void sparc_pmu_enable_event(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc, int idx)
559
559
{
560
 
        u64 val, mask = mask_for_index(idx);
 
560
        u64 enc, val, mask = mask_for_index(idx);
 
561
 
 
562
        enc = perf_event_get_enc(cpuc->events[idx]);
561
563
 
562
564
        val = cpuc->pcr;
563
565
        val &= ~mask;
564
 
        val |= hwc->config;
 
566
        val |= event_encoding(enc, idx);
565
567
        cpuc->pcr = val;
566
568
 
567
569
        pcr_ops->write(cpuc->pcr);
1426
1428
{
1427
1429
        unsigned long ufp;
1428
1430
 
1429
 
        perf_callchain_store(entry, regs->tpc);
1430
 
 
1431
1431
        ufp = regs->u_regs[UREG_I6] + STACK_BIAS;
1432
1432
        do {
1433
1433
                struct sparc_stackf *usf, sf;
1448
1448
{
1449
1449
        unsigned long ufp;
1450
1450
 
1451
 
        perf_callchain_store(entry, regs->tpc);
1452
 
 
1453
1451
        ufp = regs->u_regs[UREG_I6] & 0xffffffffUL;
1454
1452
        do {
1455
1453
                struct sparc_stackf32 *usf, sf;
1468
1466
void
1469
1467
perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
1470
1468
{
 
1469
        perf_callchain_store(entry, regs->tpc);
 
1470
 
 
1471
        if (!current->mm)
 
1472
                return;
 
1473
 
1471
1474
        flushw_user();
1472
1475
        if (test_thread_flag(TIF_32BIT))
1473
1476
                perf_callchain_user_32(entry, regs);