← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to fs/nfsd/nfs4xdr.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/nfsd/nfs4xdr.c
1142
1142
 
1143
1143
        u32 dummy;
1144
1144
        char *machine_name;
1145
 
        int i, j;
 
1145
        int i;
1146
1146
        int nr_secflavs;
1147
1147
 
1148
1148
        READ_BUF(16);
1215
1215
                        READ_BUF(4);
1216
1216
                        READ32(dummy);
1217
1217
                        READ_BUF(dummy * 4);
1218
 
                        for (j = 0; j < dummy; ++j)
1219
 
                                READ32(dummy);
1220
1218
                        break;
1221
1219
                case RPC_AUTH_GSS:
1222
1220
                        dprintk("RPC_AUTH_GSS callback secflavor "
1232
1230
                        READ_BUF(4);
1233
1231
                        READ32(dummy);
1234
1232
                        READ_BUF(dummy);
1235
 
                        p += XDR_QUADLEN(dummy);
1236
1233
                        break;
1237
1234
                default:
1238
1235
                        dprintk("Illegal callback secflavor\n");