← Back to branch summary

~ubuntu-branches/ubuntu/saucy/golang/saucy

« back to all changes in this revision

Viewing changes to src/pkg/runtime/proc.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-20 14:06:23 UTC
  • mfrom: (29.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20130820140623-k58q6hviulolwb09
Tags: 2:1.1.2-2ubuntu1
https://launchpad.net/bugs/1211749
https://launchpad.net/bugs/1202027
* Merge from Debian unstable (LP: #1211749, #1202027). Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - d/control,control.cross: Update Breaks/Replaces for Ubuntu
    versions to ensure smooth upgrades, regenerate control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/runtime/proc.c
1371
1371
                runtime·unlock(&runtime·sched);
1372
1372
                if(p) {
1373
1373
                        acquirep(p);
 
1374
                        m->p->tick++;
 
1375
                        g->status = Grunning;
1374
1376
                        g->gcstack = (uintptr)nil;
1375
1377
                        g->gcsp = (uintptr)nil;
1376
1378
                        return;