← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to kernel/kprobes.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
https://launchpad.net/bugs/963512
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/kprobes.c
1334
1334
        if (!kernel_text_address((unsigned long) p->addr) ||
1335
1335
            in_kprobes_functions((unsigned long) p->addr) ||
1336
1336
            ftrace_text_reserved(p->addr, p->addr) ||
1337
 
            jump_label_text_reserved(p->addr, p->addr)) {
1338
 
                ret = -EINVAL;
1339
 
                goto cannot_probe;
1340
 
        }
 
1337
            jump_label_text_reserved(p->addr, p->addr))
 
1338
                goto fail_with_jump_label;
1341
1339
 
1342
1340
        /* User can pass only KPROBE_FLAG_DISABLED to register_kprobe */
1343
1341
        p->flags &= KPROBE_FLAG_DISABLED;
1354
1352
                 * its code to prohibit unexpected unloading.
1355
1353
                 */
1356
1354
                if (unlikely(!try_module_get(probed_mod)))
1357
 
                        goto cannot_probe;
 
1355
                        goto fail_with_jump_label;
1358
1356
 
1359
1357
                /*
1360
1358
                 * If the module freed .init.text, we couldn't insert
1363
1361
                if (within_module_init((unsigned long)p->addr, probed_mod) &&
1364
1362
                    probed_mod->state != MODULE_STATE_COMING) {
1365
1363
                        module_put(probed_mod);
1366
 
                        goto cannot_probe;
 
1364
                        goto fail_with_jump_label;
1367
1365
                }
1368
1366
                /* ret will be updated by following code */
1369
1367
        }
1411
1409
 
1412
1410
        return ret;
1413
1411
 
1414
 
cannot_probe:
 
1412
fail_with_jump_label:
1415
1413
        preempt_enable();
1416
1414
        jump_label_unlock();
1417
1415
        return ret;